From 5a1c4f66e9fd58174e4778cbd1f956e3aae641e3 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Sun, 2 Mar 2025 01:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E8=8F=9C=E5=8D=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 + .../qihang => cn/qihangerp}/common/App.java | 2 +- .../qihangerp}/common/PageQuery.java | 3 +- .../qihangerp}/common/PageResult.java | 4 +- .../qihangerp}/common/ResultVo.java | 2 +- .../qihangerp}/common/ResultVoEnum.java | 2 +- .../qihangerp}/common/api/ShopApiParams.java | 2 +- .../common/bo/LinkErpGoodsSkuBo.java | 2 +- .../qihangerp}/common/common/AjaxResult.java | 4 +- .../qihangerp}/common/common/ApiResult.java | 0 .../qihangerp}/common/common/CharsetKit.java | 4 +- .../qihangerp}/common/common/R.java | 0 .../common/common/ServiceException.java | 2 +- .../common/common/ServletUtils.java | 0 .../common/common/TableDataInfo.java | 2 +- .../config}/FastJson2JsonRedisSerializer.java | 2 +- .../qihangerp}/common/config/RedisCache.java | 2 +- .../qihangerp}/common/config/RedisConfig.java | 2 +- .../common/constant/CacheConstants.java | 2 +- .../qihangerp}/common/constant/Constants.java | 2 +- .../qihangerp}/common/constant/Convert.java | 6 +- .../common/constant/StrFormatter.java | 4 +- .../common/constant/UserConstants.java | 2 +- .../qihangerp}/common/enums/EnumShopType.java | 2 +- .../qihangerp}/common/enums/HttpStatus.java | 2 +- .../common/enums/JdOrderStateEnum.java | 2 +- .../common/enums/TaoOrderStateEnum.java | 2 +- .../qihangerp}/common/enums/UserStatus.java | 2 +- .../common/exception/BaseException.java | 6 +- .../common/exception/UserException.java | 2 +- .../exception/UserNotExistsException.java | 2 +- .../qihangerp}/common/mq/MqMessage.java | 6 +- .../qihangerp}/common/mq/MqType.java | 2 +- .../qihangerp}/common/mq/MqUtils.java | 2 +- .../common/task/IPollableService.java | 2 +- .../common/task/SchedulingConfiguration.java | 2 +- .../qihangerp}/common/utils/DateUtils.java | 2 +- .../cn/qihangerp/common}/utils/IdUtils.java | 2 +- .../qihangerp}/common/utils/MessageUtils.java | 2 +- .../qihangerp}/common/utils/SpringUtils.java | 2 +- .../qihangerp}/common/utils/StringUtils.java | 6 +- .../java/cn/qihangerp/common}/utils/UUID.java | 2 +- .../common}/utils/http/HttpHelper.java | 2 +- .../common/utils/http/HttpUtils.java | 6 +- .../common/utils/ip/AddressUtils.java | 0 .../qihangerp}/common/utils/ip/IpUtils.java | 0 gateway/src/main/resources/application.yaml | 6 +- goods/pom.xml | 34 + .../main/java/cn/qihangerp/module/App.java | 13 + .../java/cn/qihangerp/module/goods/a.java | 4 + .../qihangerp/module/goods/domain/OGoods.java | 216 ++++++ .../module/goods/domain/OGoodsBrand.java | 49 ++ .../module/goods/domain/OGoodsCategory.java | 83 +++ .../goods/domain/OGoodsCategoryAttribute.java | 42 ++ .../domain/OGoodsCategoryAttributeValue.java | 47 ++ .../module/goods/domain/OGoodsInventory.java | 69 ++ .../goods/domain/OGoodsInventoryBatch.java | 99 +++ .../module/goods/domain/OGoodsSku.java | 122 ++++ .../module/goods/domain/OGoodsSkuAttr.java | 57 ++ .../module/goods/domain/OGoodsSupplier.java | 119 ++++ .../module/goods/domain/bo/GoodsAddBo.java | 126 ++++ .../module/goods/domain/bo/GoodsAddSkuBo.java | 90 ++- .../module/goods/domain/bo/GoodsSkuAddBo.java | 19 + .../goods/domain/vo/GoodsSpecListVo.java | 29 + .../goods/mapper/OGoodsBrandMapper.java | 18 + .../mapper/OGoodsCategoryAttributeMapper.java | 18 + .../OGoodsCategoryAttributeValueMapper.java | 18 + .../goods/mapper/OGoodsCategoryMapper.java | 18 + .../mapper/OGoodsInventoryBatchMapper.java | 18 + .../goods/mapper/OGoodsInventoryMapper.java | 18 + .../module/goods/mapper/OGoodsMapper.java | 22 + .../goods/mapper/OGoodsSkuAttrMapper.java | 18 + .../module/goods/mapper/OGoodsSkuMapper.java | 19 + .../goods/mapper/OGoodsSupplierMapper.java | 18 + .../goods/service/OGoodsBrandService.java | 15 + .../OGoodsCategoryAttributeService.java | 13 + .../OGoodsCategoryAttributeValueService.java | 13 + .../goods/service/OGoodsCategoryService.java | 13 + .../service/OGoodsInventoryBatchService.java | 13 + .../goods/service/OGoodsInventoryService.java | 16 + .../module/goods/service/OGoodsService.java | 58 ++ .../goods/service/OGoodsSkuAttrService.java | 13 + .../goods/service/OGoodsSkuService.java | 16 + .../goods/service/OGoodsSupplierService.java | 15 + .../service/impl/OGoodsBrandServiceImpl.java | 41 ++ .../OGoodsCategoryAttributeServiceImpl.java | 22 + ...oodsCategoryAttributeValueServiceImpl.java | 22 + .../impl/OGoodsCategoryServiceImpl.java | 66 ++ .../impl/OGoodsInventoryBatchServiceImpl.java | 22 + .../impl/OGoodsInventoryServiceImpl.java | 47 ++ .../goods/service/impl/OGoodsServiceImpl.java | 329 +++++++++ .../impl/OGoodsSkuAttrServiceImpl.java | 22 + .../service/impl/OGoodsSkuServiceImpl.java | 41 ++ .../impl/OGoodsSupplierServiceImpl.java | 39 ++ .../resources/mapper/OGoodsBrandMapper.xml | 22 + .../mapper/OGoodsCategoryAttributeMapper.xml | 19 + .../OGoodsCategoryAttributeValueMapper.xml | 20 + .../resources/mapper/OGoodsCategoryMapper.xml | 30 + .../mapper/OGoodsInventoryBatchMapper.xml | 35 + .../mapper/OGoodsInventoryMapper.xml | 30 + .../main/resources/mapper/OGoodsMapper.xml | 97 +++ .../resources/mapper/OGoodsSkuAttrMapper.xml | 23 + .../main/resources/mapper/OGoodsSkuMapper.xml | 43 ++ .../resources/mapper/OGoodsSupplierMapper.xml | 40 ++ oms-api/pom.xml | 5 + .../qihang => cn/qihangerp}/oms/OmsApi.java | 8 +- .../oms}/config/MybatisPlusConfig.java | 4 +- .../oms/controller/AfterSaleController.java | 13 +- .../oms/controller/GoodsBrandController.java | 70 ++ .../controller/GoodsCategoryController.java | 141 ++++ .../oms/controller/GoodsController.java | 247 +++++++ .../controller/GoodsInventoryController.java | 47 ++ .../controller/GoodsSupplierController.java | 67 ++ .../oms/controller/HomeController.java | 2 +- .../oms/controller/OrderController.java | 18 +- .../oms/controller/OrderItemController.java | 18 +- .../oms/controller/RefundController.java | 17 +- .../oms/controller/ShipController.java | 27 +- .../oms/controller/ShopController.java | 46 +- .../controller/ShopPullLogsController.java | 18 +- .../oms/domain/ErpSaleAfterInfo.java | 2 +- .../oms/domain/ErpSaleAfterRefund.java | 2 +- .../qihangerp}/oms/domain/ErpSaleOrder.java | 2 +- .../oms/domain/ErpSaleOrderItem.java | 2 +- .../qihangerp}/oms/domain/ErpShipStockUp.java | 2 +- .../qihangerp}/oms/domain/ErpShipWaybill.java | 2 +- .../qihangerp/oms/domain/OShop.java} | 71 +- .../qihangerp/oms/domain/OShopPlatform.java} | 48 +- .../oms/domain/OShopPullLasttime.java | 60 ++ .../qihangerp/oms/domain/OShopPullLogs.java | 75 +++ .../qihangerp}/oms/domain/OmsDouGoodsSku.java | 2 +- .../qihangerp}/oms/domain/OmsDouOrder.java | 2 +- .../oms/domain/OmsDouOrderItem.java | 2 +- .../qihangerp}/oms/domain/OmsDouRefund.java | 2 +- .../qihangerp}/oms/domain/OmsJdAfterSale.java | 2 +- .../qihangerp}/oms/domain/OmsJdGoodsSku.java | 2 +- .../qihangerp}/oms/domain/OmsJdOrder.java | 2 +- .../qihangerp}/oms/domain/OmsJdOrderItem.java | 2 +- .../qihangerp}/oms/domain/OmsPddGoodsSku.java | 2 +- .../qihangerp}/oms/domain/OmsPddOrder.java | 2 +- .../oms/domain/OmsPddOrderItem.java | 2 +- .../qihangerp}/oms/domain/OmsPddRefund.java | 2 +- .../qihangerp}/oms/domain/OmsTaoGoodsSku.java | 2 +- .../qihangerp}/oms/domain/OmsTaoOrder.java | 2 +- .../oms/domain/OmsTaoOrderItem.java | 2 +- .../qihangerp}/oms/domain/OmsTaoRefund.java | 2 +- .../qihangerp}/oms/domain/OmsWeiGoodsSku.java | 2 +- .../qihangerp}/oms/domain/OmsWeiOrder.java | 2 +- .../oms/domain/OmsWeiOrderItem.java | 2 +- .../qihangerp}/oms/domain/OmsWeiRefund.java | 2 +- .../java/cn/qihangerp/oms/domain/SShop.java | 118 ++++ .../java/cn/qihangerp/oms/domain/ShopBo.java | 40 ++ .../oms/domain/SysLogisticsCompany.java | 2 +- .../qihangerp/oms/domain/SysShopPullLogs.java | 245 +++++++ .../oms/domain/bo/OrderItemListBo.java | 2 +- .../oms/domain/bo/ShipStockUpBo.java | 2 +- .../oms/domain/bo/ShipWaybillBo.java | 2 +- .../oms/domain/vo/OrderItemListVo.java | 2 +- .../oms/mapper/ErpSaleAfterInfoMapper.java | 4 +- .../oms/mapper/ErpSaleAfterRefundMapper.java | 4 +- .../oms/mapper/ErpSaleOrderItemMapper.java | 8 +- .../oms/mapper/ErpSaleOrderMapper.java | 4 +- .../oms/mapper/ErpShipStockUpMapper.java | 4 +- .../oms/mapper/ErpShipWaybillMapper.java | 4 +- .../cn/qihangerp/oms/mapper/OShopMapper.java | 19 + .../oms/mapper/OShopPlatformMapper.java | 19 + .../oms/mapper/OShopPullLasttimeMapper.java | 19 + .../oms/mapper/OShopPullLogsMapper.java} | 9 +- .../oms/mapper/OmsDouGoodsSkuMapper.java | 4 +- .../oms/mapper/OmsDouOrderItemMapper.java | 4 +- .../oms/mapper/OmsDouOrderMapper.java | 4 +- .../oms/mapper/OmsDouRefundMapper.java | 4 +- .../oms/mapper/OmsJdAfterSaleMapper.java | 4 +- .../oms/mapper/OmsJdGoodsSkuMapper.java | 4 +- .../oms/mapper/OmsJdOrderItemMapper.java | 4 +- .../oms/mapper/OmsJdOrderMapper.java | 4 +- .../oms/mapper/OmsPddGoodsSkuMapper.java | 4 +- .../oms/mapper/OmsPddOrderItemMapper.java | 4 +- .../oms/mapper/OmsPddOrderMapper.java | 4 +- .../oms/mapper/OmsPddRefundMapper.java | 4 +- .../oms/mapper/OmsTaoGoodsSkuMapper.java | 4 +- .../oms/mapper/OmsTaoOrderItemMapper.java | 4 +- .../oms/mapper/OmsTaoOrderMapper.java | 4 +- .../oms/mapper/OmsTaoRefundMapper.java | 4 +- .../oms/mapper/OmsWeiGoodsSkuMapper.java | 4 +- .../oms/mapper/OmsWeiOrderItemMapper.java | 4 +- .../oms/mapper/OmsWeiOrderMapper.java | 4 +- .../oms/mapper/OmsWeiRefundMapper.java | 4 +- .../oms/mapper/SysLogisticsCompanyMapper.java | 4 +- .../qihangerp}/oms/mapper/SysUserMapper.java | 4 +- .../qihangerp}/oms/mq/ApiMessageReceiver.java | 12 +- .../qihangerp}/oms/mq/KafkaMQConsumer.java | 13 +- .../qihangerp}/oms/mq/MqMessage.java | 2 +- .../qihangerp}/oms/mq/MqUtils.java | 2 +- .../qihangerp}/oms/mq/SubscriberConfig.java | 2 +- .../oms/service/ErpSaleAfterInfoService.java | 8 +- .../service/ErpSaleAfterRefundService.java | 11 +- .../oms/service/ErpSaleOrderItemService.java | 12 +- .../oms/service/ErpSaleOrderService.java | 10 +- .../oms/service/ErpShipStockUpService.java | 11 +- .../oms/service/ErpShipWaybillService.java | 12 +- .../oms/service/OShopPlatformService.java | 14 + .../oms/service/OShopPullLasttimeService.java | 18 + .../oms/service/OShopPullLogsService.java | 17 + .../qihangerp/oms/service/OShopService.java | 32 + .../oms/service/OmsDouGoodsSkuService.java | 4 +- .../oms/service/OmsDouOrderItemService.java | 4 +- .../oms/service/OmsDouOrderService.java | 4 +- .../oms/service/OmsDouRefundService.java | 4 +- .../oms/service/OmsJdAfterSaleService.java | 4 +- .../oms/service/OmsJdGoodsSkuService.java | 4 +- .../oms/service/OmsJdOrderItemService.java | 4 +- .../oms/service/OmsJdOrderService.java | 4 +- .../oms/service/OmsPddGoodsSkuService.java | 4 +- .../oms/service/OmsPddOrderItemService.java | 4 +- .../oms/service/OmsPddOrderService.java | 4 +- .../oms/service/OmsPddRefundService.java | 4 +- .../oms/service/OmsTaoGoodsSkuService.java | 4 +- .../oms/service/OmsTaoOrderItemService.java | 4 +- .../oms/service/OmsTaoOrderService.java | 4 +- .../oms/service/OmsTaoRefundService.java | 4 +- .../oms/service/OmsWeiGoodsSkuService.java | 4 +- .../oms/service/OmsWeiOrderItemService.java | 4 +- .../oms/service/OmsWeiOrderService.java | 4 +- .../oms/service/OmsWeiRefundService.java | 4 +- .../oms/service/SShopPlatformService.java | 13 + .../service/SysLogisticsCompanyService.java | 8 +- .../impl/ErpSaleAfterInfoServiceImpl.java | 14 +- .../impl/ErpSaleAfterRefundServiceImpl.java | 20 +- .../impl/ErpSaleOrderItemServiceImpl.java | 18 +- .../service/impl/ErpSaleOrderServiceImpl.java | 29 +- .../impl/ErpShipStockUpServiceImpl.java | 16 +- .../impl/ErpShipWaybillServiceImpl.java | 18 +- .../impl/OShopPlatformServiceImpl.java | 29 + .../impl/OShopPullLasttimeServiceImpl.java | 43 ++ .../impl/OShopPullLogsServiceImpl.java | 41 ++ .../oms/service/impl/OShopServiceImpl.java | 120 ++++ .../impl/OmsDouGoodsSkuServiceImpl.java | 8 +- .../impl/OmsDouOrderItemServiceImpl.java | 10 +- .../service/impl/OmsDouOrderServiceImpl.java | 10 +- .../service/impl/OmsDouRefundServiceImpl.java | 8 +- .../impl/OmsJdAfterSaleServiceImpl.java | 10 +- .../impl/OmsJdGoodsSkuServiceImpl.java | 10 +- .../impl/OmsJdOrderItemServiceImpl.java | 8 +- .../service/impl/OmsJdOrderServiceImpl.java | 10 +- .../impl/OmsPddGoodsSkuServiceImpl.java | 8 +- .../impl/OmsPddOrderItemServiceImpl.java | 10 +- .../service/impl/OmsPddOrderServiceImpl.java | 10 +- .../service/impl/OmsPddRefundServiceImpl.java | 10 +- .../impl/OmsTaoGoodsSkuServiceImpl.java | 10 +- .../impl/OmsTaoOrderItemServiceImpl.java | 10 +- .../service/impl/OmsTaoOrderServiceImpl.java | 10 +- .../service/impl/OmsTaoRefundServiceImpl.java | 10 +- .../impl/OmsWeiGoodsSkuServiceImpl.java | 10 +- .../impl/OmsWeiOrderItemServiceImpl.java | 10 +- .../service/impl/OmsWeiOrderServiceImpl.java | 10 +- .../service/impl/OmsWeiRefundServiceImpl.java | 10 +- .../impl/SShopPlatformServiceImpl.java | 22 + .../impl/SysLogisticsCompanyServiceImpl.java | 14 +- .../oms/service/impl/SysUserServiceImpl.java | 14 +- .../qihangerp}/oms/utils/BaseController.java | 0 .../qihangerp}/oms/utils/SecurityUtils.java | 0 .../cn/qihangerp/oms/vo/GoodsSpecListVo.java | 103 +++ .../qihang/oms/domain/SysShopPullLogs.java | 245 ------- .../com/qihang/oms/mapper/SShopMapper.java | 18 - .../oms/mapper/SShopPlatformMapper.java | 18 - .../oms/service/SShopPlatformService.java | 13 - .../com/qihang/oms/service/SShopService.java | 13 - .../oms/service/SysShopPullLogsService.java | 16 - .../impl/SShopPlatformServiceImpl.java | 22 - .../oms/service/impl/SShopServiceImpl.java | 22 - .../impl/SysShopPullLogsServiceImpl.java | 40 -- oms-api/src/main/resources/application.yml | 19 +- .../mapper/ErpSaleAfterInfoMapper.xml | 4 +- .../mapper/ErpSaleAfterRefundMapper.xml | 4 +- .../mapper/ErpSaleOrderItemMapper.xml | 4 +- .../resources/mapper/ErpSaleOrderMapper.xml | 4 +- .../resources/mapper/ErpShipStockUpMapper.xml | 4 +- .../resources/mapper/ErpShipWaybillMapper.xml | 4 +- .../src/main/resources/mapper/OShopMapper.xml | 38 ++ ...formMapper.xml => OShopPlatformMapper.xml} | 18 +- .../mapper/OShopPullLasttimeMapper.xml | 20 + ...LogsMapper.xml => OShopPullLogsMapper.xml} | 4 +- .../resources/mapper/OmsDouGoodsSkuMapper.xml | 4 +- .../mapper/OmsDouOrderItemMapper.xml | 4 +- .../resources/mapper/OmsDouOrderMapper.xml | 4 +- .../resources/mapper/OmsDouRefundMapper.xml | 4 +- .../resources/mapper/OmsJdAfterSaleMapper.xml | 4 +- .../resources/mapper/OmsJdGoodsSkuMapper.xml | 4 +- .../resources/mapper/OmsJdOrderItemMapper.xml | 4 +- .../resources/mapper/OmsJdOrderMapper.xml | 4 +- .../resources/mapper/OmsPddGoodsSkuMapper.xml | 4 +- .../mapper/OmsPddOrderItemMapper.xml | 4 +- .../resources/mapper/OmsPddOrderMapper.xml | 4 +- .../resources/mapper/OmsPddRefundMapper.xml | 4 +- .../resources/mapper/OmsTaoGoodsSkuMapper.xml | 4 +- .../mapper/OmsTaoOrderItemMapper.xml | 4 +- .../resources/mapper/OmsTaoOrderMapper.xml | 4 +- .../resources/mapper/OmsTaoRefundMapper.xml | 4 +- .../resources/mapper/OmsWeiGoodsSkuMapper.xml | 4 +- .../mapper/OmsWeiOrderItemMapper.xml | 4 +- .../resources/mapper/OmsWeiOrderMapper.xml | 4 +- .../resources/mapper/OmsWeiRefundMapper.xml | 4 +- .../src/main/resources/mapper/SShopMapper.xml | 39 -- .../mapper/SysLogisticsCompanyMapper.xml | 4 +- .../main/resources/mapper/SysUserMapper.xml | 2 +- .../main/java/cn/qihangerp/open/OpenApi.java | 2 +- .../open/config/MybatisPlusConfig.java | 2 +- .../open/dou/controller/DouApiHelper.java | 6 +- .../dou/controller/DouGoodsApiController.java | 6 +- .../dou/controller/DouGoodsController.java | 12 +- .../dou/controller/DouOrderApiController.java | 12 +- .../dou/controller/DouOrderContoller.java | 16 +- .../controller/DouRefundApiController.java | 12 +- .../dou/controller/DouRefundController.java | 16 +- .../dou/controller/DouWaybillController.java | 8 +- .../open/dou/service/OmsDouGoodsService.java | 4 +- .../dou/service/OmsDouGoodsSkuService.java | 4 +- .../open/dou/service/OmsDouOrderService.java | 6 +- .../open/dou/service/OmsDouRefundService.java | 6 +- .../service/impl/OmsDouGoodsServiceImpl.java | 6 +- .../impl/OmsDouGoodsSkuServiceImpl.java | 4 +- .../service/impl/OmsDouOrderServiceImpl.java | 10 +- .../service/impl/OmsDouRefundServiceImpl.java | 8 +- .../cn/qihangerp/open/jd/JdApiCommon.java | 8 +- .../controller/JdAfterSaleApiController.java | 14 +- .../jd/controller/JdAfterSaleController.java | 16 +- .../jd/controller/JdGoodsApiController.java | 6 +- .../open/jd/controller/JdGoodsController.java | 12 +- .../open/jd/controller/JdOAuthController.java | 4 +- .../jd/controller/JdOrderApiController.java | 12 +- .../open/jd/controller/JdOrderController.java | 16 +- .../jd/controller/JdWaybillController.java | 6 +- .../jd/service/OmsJdAfterSaleService.java | 6 +- .../open/jd/service/OmsJdGoodsSkuService.java | 6 +- .../open/jd/service/OmsJdOrderService.java | 6 +- .../impl/OmsJdAfterSaleServiceImpl.java | 8 +- .../impl/OmsJdGoodsSkuServiceImpl.java | 6 +- .../service/impl/OmsJdOrderServiceImpl.java | 8 +- .../kwai/controller/KwaiOAuthController.java | 2 +- .../controller/KwaiOrderApiController.java | 8 +- .../qihangerp/open/mapper/SysUserMapper.java | 2 +- .../cn/qihangerp/open/pdd/PddApiCommon.java | 8 +- .../pdd/controller/PddGoodsApiController.java | 9 +- .../pdd/controller/PddGoodsController.java | 12 +- .../pdd/controller/PddOAuthController.java | 4 +- .../pdd/controller/PddOrderApiController.java | 12 +- .../pdd/controller/PddOrderController.java | 16 +- .../controller/PddRefundApiController.java | 4 +- .../pdd/controller/PddRefundController.java | 16 +- .../pdd/controller/PddWaybillController.java | 6 +- .../open/pdd/service/OmsPddGoodsService.java | 4 +- .../pdd/service/OmsPddGoodsSkuService.java | 4 +- .../open/pdd/service/OmsPddOrderService.java | 6 +- .../open/pdd/service/OmsPddRefundService.java | 6 +- .../service/impl/OmsPddGoodsServiceImpl.java | 6 +- .../impl/OmsPddGoodsSkuServiceImpl.java | 4 +- .../service/impl/OmsPddOrderServiceImpl.java | 8 +- .../service/impl/OmsPddRefundServiceImpl.java | 8 +- .../open/service/ErpShipWaybillService.java | 2 +- .../impl/ErpShipWaybillServiceImpl.java | 8 +- .../open/service/impl/SysUserServiceImpl.java | 10 +- .../cn/qihangerp/open/tao/TaoApiCommon.java | 8 +- .../tao/controller/TaoGoodsApiController.java | 17 +- .../tao/controller/TaoGoodsController.java | 12 +- .../tao/controller/TaoOAuthController.java | 4 +- .../tao/controller/TaoOrderApiController.java | 14 +- .../tao/controller/TaoOrderContoller.java | 16 +- .../controller/TaoRefundApiController.java | 16 +- .../tao/controller/TaoRefundContoller.java | 16 +- .../tao/controller/TaoWaybillController.java | 6 +- .../open/tao/service/OmsTaoGoodsService.java | 4 +- .../tao/service/OmsTaoGoodsSkuService.java | 4 +- .../open/tao/service/OmsTaoOrderService.java | 6 +- .../open/tao/service/OmsTaoRefundService.java | 6 +- .../service/impl/OmsTaoGoodsServiceImpl.java | 6 +- .../impl/OmsTaoGoodsSkuServiceImpl.java | 4 +- .../service/impl/OmsTaoOrderServiceImpl.java | 8 +- .../service/impl/OmsTaoRefundServiceImpl.java | 6 +- .../open/wei/controller/WeiApiCommon.java | 6 +- .../wei/controller/WeiGoodsApiController.java | 6 +- .../wei/controller/WeiGoodsController.java | 12 +- .../wei/controller/WeiOrderApiController.java | 8 +- .../wei/controller/WeiOrderController.java | 16 +- .../controller/WeiRefundApiController.java | 14 +- .../wei/controller/WeiRefundController.java | 16 +- .../wei/controller/WeiWayBillController.java | 6 +- .../wei/service/OmsWeiGoodsSkuService.java | 4 +- .../open/wei/service/OmsWeiOrderService.java | 6 +- .../open/wei/service/OmsWeiRefundService.java | 6 +- .../service/impl/OmsWeiGoodsServiceImpl.java | 2 +- .../impl/OmsWeiGoodsSkuServiceImpl.java | 4 +- .../service/impl/OmsWeiOrderServiceImpl.java | 8 +- .../service/impl/OmsWeiRefundServiceImpl.java | 8 +- open-api/src/main/resources/application.yml | 4 +- pom.xml | 1 + .../qihang => cn/qihangerp}/security/App.java | 2 +- .../security/AuthenticationContextHolder.java | 2 +- .../AuthenticationExceptionHandler.java | 6 +- .../JwtAuthenticationTokenFilter.java | 6 +- .../qihangerp}/security/LoginUser.java | 4 +- .../security/LogoutSuccessHandlerImpl.java | 9 +- .../qihangerp}/security/SecurityConfig.java | 2 +- .../qihangerp}/security/TokenService.java | 18 +- .../security/UserDetailsServiceImpl.java | 14 +- .../UserPasswordNotMatchException.java | 4 +- .../security/common/BaseController.java | 14 +- .../qihangerp/security/common/Constants.java | 108 +++ .../security/common/SecurityUtils.java | 8 +- .../qihangerp}/security/entity/SysUser.java | 2 +- .../security/mapper/SysUserMapper.java | 0 .../security/service/ISysUserService.java | 4 +- .../security/service/SysLoginService.java | 26 +- .../service/impl/SysUserServiceImpl.java | 0 .../security/utils/AddressUtils.java | 6 +- .../qihangerp}/security/utils/IpUtils.java | 4 +- .../security/utils/ServletUtils.java | 8 +- .../qihangerp}/security/vo/MetaVo.java | 4 +- .../qihangerp}/security/vo/RouterVo.java | 2 +- sys-api/pom.xml | 1 + .../sys/api => cn/qihangerp/sys}/SysApi.java | 7 +- .../qihangerp/sys}/common/DictUtils.java | 12 +- .../sys}/config/MybatisPlusConfig.java | 4 +- .../sys}/controller/HomeController.java | 4 +- .../controller/SysDictDataController.java | 16 +- .../controller/SysDictTypeController.java | 12 +- .../sys}/controller/SysLoginController.java | 23 +- .../sys}/controller/SysMenuController.java | 111 ++-- .../sys}/controller/SysTaskController.java | 18 +- .../sys}/controller/SysUserController.java | 16 +- .../qihangerp/sys}/domain/BaseEntity.java | 2 +- .../qihangerp/sys}/domain/LoginBody.java | 2 +- .../java/cn/qihangerp/sys/domain/SysDept.java | 195 ++++++ .../qihangerp/sys}/domain/SysDictData.java | 4 +- .../qihangerp/sys}/domain/SysDictType.java | 2 +- .../java/cn/qihangerp/sys/domain/SysMenu.java | 278 ++++++++ .../java/cn/qihangerp/sys/domain/SysRole.java | 262 ++++++++ .../cn/qihangerp/sys/domain/SysRoleMenu.java | 46 ++ .../qihangerp/sys}/domain/SysTask.java | 2 +- .../qihangerp/sys}/domain/SysTaskLogs.java | 2 +- .../cn/qihangerp/sys/domain/SysUserRole.java | 46 ++ .../qihangerp/sys/domain/vo/MenuMetaVo.java | 4 + .../sys}/domain/vo/MenusDetailVo.java | 2 +- .../qihangerp/sys}/domain/vo/MenusVo.java | 2 +- .../qihangerp/sys/domain/vo/TreeSelect.java | 77 +++ .../qihangerp/sys}/domain/vo/UserInfoVo.java | 2 +- .../qihangerp/sys}/feign/EchoService.java | 2 +- .../qihangerp/sys/mapper/SysDeptMapper.java | 121 ++++ .../sys}/mapper/SysDictDataMapper.java | 4 +- .../sys}/mapper/SysDictTypeMapper.java | 4 +- .../qihangerp/sys/mapper/SysMenuMapper.java | 127 ++++ .../qihangerp/sys/mapper/SysRoleMapper.java | 111 ++++ .../sys/mapper/SysRoleMenuMapper.java | 48 ++ .../sys}/mapper/SysTaskLogsMapper.java | 4 +- .../qihangerp/sys}/mapper/SysTaskMapper.java | 4 +- .../qihangerp/sys}/mapper/SysUserMapper.java | 4 +- .../sys/mapper/SysUserRoleMapper.java | 64 ++ .../sys}/service/ISysDictDataService.java | 4 +- .../sys}/service/ISysDictTypeService.java | 6 +- .../sys/service/ISysMenuService.java | 156 +++++ .../sys/service/ISysRoleService.java | 174 +++++ .../qihangerp/sys/service/SysMenuService.java | 36 + .../sys}/service/SysPermissionService.java | 11 +- .../sys}/service/SysTaskLogsService.java | 9 +- .../sys}/service/SysTaskService.java | 8 +- .../service/impl/SysDictDataServiceImpl.java | 10 +- .../service/impl/SysDictTypeServiceImpl.java | 20 +- .../sys}/service/impl/SysMenuServiceImpl.java | 417 +++++++++--- .../sys/service/impl/SysRoleServiceImpl.java | 419 ++++++++++++ .../service/impl/SysTaskLogsServiceImpl.java | 15 +- .../sys}/service/impl/SysTaskServiceImpl.java | 14 +- .../sys}/service/impl/SysUserServiceImpl.java | 18 +- .../qihangerp/sys}/utils/DateUtils.java | 2 +- .../utils}/FastJson2JsonRedisSerializer.java | 2 +- .../java/cn/qihangerp/sys}/utils/IdUtils.java | 2 +- .../java/cn/qihangerp/sys}/utils/UUID.java | 2 +- .../qihangerp/sys}/utils/http/HttpHelper.java | 2 +- .../qihangerp/sys}/utils/ip/AddressUtils.java | 0 .../qihangerp/sys}/utils/ip/IpUtils.java | 0 .../com/qihang/sys/api/domain/SysMenu.java | 121 ---- .../com/qihang/sys/api/domain/SysRole.java | 352 ---------- .../qihang/sys/api/domain/vo/MenuMetaVo.java | 4 - .../qihang/sys/api/mapper/SysMenuMapper.java | 23 - .../qihang/sys/api/mapper/SysRoleMapper.java | 20 - .../sys/api/service/SysMenuService.java | 21 - .../sys/api/service/SysRoleService.java | 19 - .../api/service/impl/SysRoleServiceImpl.java | 45 -- sys-api/src/main/resources/application.yaml | 4 +- .../main/resources/mapper/SysDeptMapper.xml | 159 +++++ .../main/resources/mapper/SysMenuMapper.xml | 253 +++++-- .../main/resources/mapper/SysRoleMapper.xml | 4 +- .../resources/mapper/SysRoleMenuMapper.xml | 34 + .../resources/mapper/SysTaskLogsMapper.xml | 4 +- .../main/resources/mapper/SysTaskMapper.xml | 4 +- .../resources/mapper/SysUserRoleMapper.xml | 44 ++ .../mapper/system/SysDictDataMapper.xml | 2 +- .../mapper/system/SysDictTypeMapper.xml | 2 +- .../resources/mapper/user/SysUserMapper.xml | 2 +- vue/src/api/goods/brand.js | 10 +- vue/src/api/goods/category.js | 10 +- vue/src/api/goods/categoryAttribute.js | 10 +- vue/src/api/goods/categoryAttributeValue.js | 10 +- vue/src/api/goods/goods.js | 13 +- vue/src/api/goods/goodsInventory.js | 30 +- vue/src/api/goods/supplier.js | 44 ++ vue/src/api/offline/goodsSku.js | 53 ++ vue/src/api/offline/order.js | 35 + vue/src/api/offline/refund.js | 13 + vue/src/api/offline/ship.js | 19 + vue/src/api/offline/shop.js | 44 ++ vue/src/api/system/menu.js | 4 +- vue/src/views/dou/goods/index.vue | 315 +++++++++ vue/src/views/dou/order/index.vue | 402 +++++++++++ vue/src/views/dou/refund/index.vue | 13 +- vue/src/views/goods/brand/index.vue | 260 ++++++++ .../goods/category/categoryAttribute.vue | 306 +++++++++ .../goods/category/categoryAttributeValue.vue | 315 +++++++++ vue/src/views/goods/category/index.vue | 363 ++++++++++ vue/src/views/goods/create.vue | 626 ++++++++++++++++++ vue/src/views/goods/goodsInventory/index.vue | 270 ++++++++ vue/src/views/goods/index.vue | 601 +++++++++++++++++ vue/src/views/goods/shopGoods/index.vue | 70 ++ vue/src/views/goods/spec/index.vue | 311 +++++++++ vue/src/views/goods/supplier/index.vue | 388 +++++++++++ vue/src/views/offline/aftersale/index.vue | 351 ++++++++++ vue/src/views/offline/goods/index.vue | 329 +++++++++ vue/src/views/offline/order/create.vue | 481 ++++++++++++++ vue/src/views/offline/order/index.vue | 548 +++++++++++++++ vue/src/views/offline/shop/index.vue | 330 +++++++++ vue/src/views/pdd/goods/index.vue | 302 +++++++++ vue/src/views/pdd/order/index.vue | 404 +++++++++++ vue/src/views/pdd/refund/index.vue | 291 ++++++++ vue/src/views/wei/goods/index.vue | 275 ++++++++ vue/src/views/wei/order/index.vue | 509 ++++++++++++++ vue/src/views/wei/order/pull_log.vue | 143 ++++ vue/src/views/wei/refund/index.vue | 391 +++++++++++ vue/vue.config.js | 4 +- 537 files changed, 17332 insertions(+), 2614 deletions(-) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/App.java (84%) rename common/src/main/java/{com/qihang/common => cn/qihangerp}/common/PageQuery.java (96%) rename common/src/main/java/{com/qihang/common => cn/qihangerp}/common/PageResult.java (93%) rename common/src/main/java/{com/qihang/common => cn/qihangerp}/common/ResultVo.java (98%) rename common/src/main/java/{com/qihang/common => cn/qihangerp}/common/ResultVoEnum.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/api/ShopApiParams.java (88%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/bo/LinkErpGoodsSkuBo.java (82%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/AjaxResult.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/ApiResult.java (100%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/CharsetKit.java (96%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/R.java (100%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/ServiceException.java (97%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/ServletUtils.java (100%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/common/TableDataInfo.java (97%) rename {sys-api/src/main/java/com/qihang/sys/api/utils => common/src/main/java/cn/qihangerp/common/config}/FastJson2JsonRedisSerializer.java (97%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/config/RedisCache.java (99%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/config/RedisConfig.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/constant/CacheConstants.java (95%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/constant/Constants.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/constant/Convert.java (99%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/constant/StrFormatter.java (97%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/constant/UserConstants.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/enums/EnumShopType.java (96%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/enums/HttpStatus.java (96%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/enums/JdOrderStateEnum.java (97%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/enums/TaoOrderStateEnum.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/enums/UserStatus.java (92%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/exception/BaseException.java (92%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/exception/UserException.java (87%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/exception/UserNotExistsException.java (87%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/mq/MqMessage.java (92%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/mq/MqType.java (94%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/mq/MqUtils.java (93%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/task/IPollableService.java (92%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/task/SchedulingConfiguration.java (99%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/DateUtils.java (99%) rename {sys-api/src/main/java/com/qihang/sys/api => common/src/main/java/cn/qihangerp/common}/utils/IdUtils.java (96%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/MessageUtils.java (94%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/SpringUtils.java (99%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/StringUtils.java (99%) rename {sys-api/src/main/java/com/qihang/sys/api => common/src/main/java/cn/qihangerp/common}/utils/UUID.java (99%) rename {sys-api/src/main/java/com/qihang/sys/api => common/src/main/java/cn/qihangerp/common}/utils/http/HttpHelper.java (97%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/http/HttpUtils.java (98%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/ip/AddressUtils.java (100%) rename common/src/main/java/{com/qihang => cn/qihangerp}/common/utils/ip/IpUtils.java (100%) create mode 100644 goods/pom.xml create mode 100644 goods/src/main/java/cn/qihangerp/module/App.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/a.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java rename oms-api/src/main/java/com/qihang/oms/vo/GoodsSpecListVo.java => goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java (53%) create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java create mode 100644 goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java create mode 100644 goods/src/main/resources/mapper/OGoodsBrandMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsCategoryMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsInventoryMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsSkuMapper.xml create mode 100644 goods/src/main/resources/mapper/OGoodsSupplierMapper.xml rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/OmsApi.java (71%) rename {sys-api/src/main/java/com/qihang/sys/api => oms-api/src/main/java/cn/qihangerp/oms}/config/MybatisPlusConfig.java (87%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/AfterSaleController.java (66%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsBrandController.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsCategoryController.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsController.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsInventoryController.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsSupplierController.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/HomeController.java (92%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/OrderController.java (79%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/OrderItemController.java (64%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/RefundController.java (60%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/ShipController.java (57%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/ShopController.java (63%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/controller/ShopPullLogsController.java (55%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpSaleAfterInfo.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpSaleAfterRefund.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpSaleOrder.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpSaleOrderItem.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpShipStockUp.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/ErpShipWaybill.java (97%) rename oms-api/src/main/java/{com/qihang/oms/domain/SShop.java => cn/qihangerp/oms/domain/OShop.java} (57%) rename oms-api/src/main/java/{com/qihang/oms/domain/SShopPlatform.java => cn/qihangerp/oms/domain/OShopPlatform.java} (51%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLasttime.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLogs.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsDouGoodsSku.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsDouOrder.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsDouOrderItem.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsDouRefund.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsJdAfterSale.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsJdGoodsSku.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsJdOrder.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsJdOrderItem.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsPddGoodsSku.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsPddOrder.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsPddOrderItem.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsPddRefund.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsTaoGoodsSku.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsTaoOrder.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsTaoOrderItem.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsTaoRefund.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsWeiGoodsSku.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsWeiOrder.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsWeiOrderItem.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/OmsWeiRefund.java (98%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/domain/SShop.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/domain/ShopBo.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/SysLogisticsCompany.java (99%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/domain/SysShopPullLogs.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/bo/OrderItemListBo.java (95%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/bo/ShipStockUpBo.java (79%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/bo/ShipWaybillBo.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/domain/vo/OrderItemListVo.java (96%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpSaleAfterInfoMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpSaleAfterRefundMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpSaleOrderItemMapper.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpSaleOrderMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpShipStockUpMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/ErpShipWaybillMapper.java (80%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopMapper.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPlatformMapper.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLasttimeMapper.java rename oms-api/src/main/java/{com/qihang/oms/mapper/SysShopPullLogsMapper.java => cn/qihangerp/oms/mapper/OShopPullLogsMapper.java} (50%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsDouGoodsSkuMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsDouOrderItemMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsDouOrderMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsDouRefundMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsJdAfterSaleMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsJdGoodsSkuMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsJdOrderItemMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsJdOrderMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsPddGoodsSkuMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsPddOrderItemMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsPddOrderMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsPddRefundMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsTaoGoodsSkuMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsTaoOrderItemMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsTaoOrderMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsTaoRefundMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsWeiGoodsSkuMapper.java (79%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsWeiOrderItemMapper.java (79%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsWeiOrderMapper.java (79%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/OmsWeiRefundMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/SysLogisticsCompanyMapper.java (80%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mapper/SysUserMapper.java (97%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mq/ApiMessageReceiver.java (90%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mq/KafkaMQConsumer.java (93%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mq/MqMessage.java (90%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mq/MqUtils.java (89%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/mq/SubscriberConfig.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpSaleAfterInfoService.java (69%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpSaleAfterRefundService.java (72%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpSaleOrderItemService.java (58%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpSaleOrderService.java (83%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpShipStockUpService.java (58%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/ErpShipWaybillService.java (55%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/OShopPlatformService.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLasttimeService.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLogsService.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/OShopService.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsDouGoodsSkuService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsDouOrderItemService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsDouOrderService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsDouRefundService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsJdAfterSaleService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsJdGoodsSkuService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsJdOrderItemService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsJdOrderService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsPddGoodsSkuService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsPddOrderItemService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsPddOrderService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsPddRefundService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsTaoGoodsSkuService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsTaoOrderItemService.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsTaoOrderService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsTaoRefundService.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsWeiGoodsSkuService.java (76%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsWeiOrderItemService.java (76%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsWeiOrderService.java (76%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/OmsWeiRefundService.java (78%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/SShopPlatformService.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/SysLogisticsCompanyService.java (70%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpSaleAfterInfoServiceImpl.java (78%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpSaleAfterRefundServiceImpl.java (99%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpSaleOrderItemServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpSaleOrderServiceImpl.java (98%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpShipStockUpServiceImpl.java (75%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/ErpShipWaybillServiceImpl.java (74%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPlatformServiceImpl.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLasttimeServiceImpl.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLogsServiceImpl.java create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopServiceImpl.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsDouGoodsSkuServiceImpl.java (68%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsDouOrderItemServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsDouOrderServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsDouRefundServiceImpl.java (68%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsJdAfterSaleServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsJdGoodsSkuServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsJdOrderItemServiceImpl.java (68%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsJdOrderServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsPddGoodsSkuServiceImpl.java (68%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsPddOrderItemServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsPddOrderServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsPddRefundServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsTaoOrderItemServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsTaoOrderServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsTaoRefundServiceImpl.java (62%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java (60%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsWeiOrderItemServiceImpl.java (60%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsWeiOrderServiceImpl.java (61%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/OmsWeiRefundServiceImpl.java (62%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/service/impl/SShopPlatformServiceImpl.java rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/SysLogisticsCompanyServiceImpl.java (77%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/service/impl/SysUserServiceImpl.java (95%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/utils/BaseController.java (100%) rename oms-api/src/main/java/{com/qihang => cn/qihangerp}/oms/utils/SecurityUtils.java (100%) create mode 100644 oms-api/src/main/java/cn/qihangerp/oms/vo/GoodsSpecListVo.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/domain/SysShopPullLogs.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/mapper/SShopMapper.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/mapper/SShopPlatformMapper.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/SShopPlatformService.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/SShopService.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/SysShopPullLogsService.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/SShopPlatformServiceImpl.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/SShopServiceImpl.java delete mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/SysShopPullLogsServiceImpl.java create mode 100644 oms-api/src/main/resources/mapper/OShopMapper.xml rename oms-api/src/main/resources/mapper/{SShopPlatformMapper.xml => OShopPlatformMapper.xml} (52%) create mode 100644 oms-api/src/main/resources/mapper/OShopPullLasttimeMapper.xml rename oms-api/src/main/resources/mapper/{SysShopPullLogsMapper.xml => OShopPullLogsMapper.xml} (87%) delete mode 100644 oms-api/src/main/resources/mapper/SShopMapper.xml rename security/src/main/java/{com/qihang => cn/qihangerp}/security/App.java (80%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/AuthenticationContextHolder.java (94%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/AuthenticationExceptionHandler.java (92%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/JwtAuthenticationTokenFilter.java (96%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/LoginUser.java (98%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/LogoutSuccessHandlerImpl.java (87%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/SecurityConfig.java (99%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/TokenService.java (93%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/UserDetailsServiceImpl.java (87%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/UserPasswordNotMatchException.java (78%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/common/BaseController.java (90%) create mode 100644 security/src/main/java/cn/qihangerp/security/common/Constants.java rename security/src/main/java/{com/qihang => cn/qihangerp}/security/common/SecurityUtils.java (93%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/entity/SysUser.java (99%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/mapper/SysUserMapper.java (100%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/service/ISysUserService.java (97%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/service/SysLoginService.java (88%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/service/impl/SysUserServiceImpl.java (100%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/utils/AddressUtils.java (91%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/utils/IpUtils.java (99%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/utils/ServletUtils.java (96%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/vo/MetaVo.java (95%) rename security/src/main/java/{com/qihang => cn/qihangerp}/security/vo/RouterVo.java (98%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/SysApi.java (83%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/common/DictUtils.java (94%) rename {oms-api/src/main/java/com/qihang/oms => sys-api/src/main/java/cn/qihangerp/sys}/config/MybatisPlusConfig.java (90%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/HomeController.java (93%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysDictDataController.java (86%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysDictTypeController.java (90%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysLoginController.java (80%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysMenuController.java (52%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysTaskController.java (71%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/controller/SysUserController.java (94%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/BaseEntity.java (98%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/LoginBody.java (96%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/SysDept.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/SysDictData.java (97%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/SysDictType.java (97%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/SysMenu.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/SysRole.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/SysRoleMenu.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/SysTask.java (99%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/SysTaskLogs.java (99%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/SysUserRole.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenuMetaVo.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/vo/MenusDetailVo.java (96%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/vo/MenusVo.java (97%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/domain/vo/TreeSelect.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/domain/vo/UserInfoVo.java (96%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/feign/EchoService.java (91%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDeptMapper.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/mapper/SysDictDataMapper.java (96%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/mapper/SysDictTypeMapper.java (95%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/mapper/SysMenuMapper.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMapper.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMenuMapper.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/mapper/SysTaskLogsMapper.java (78%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/mapper/SysTaskMapper.java (78%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/mapper/SysUserMapper.java (97%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserRoleMapper.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/ISysDictDataService.java (94%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/ISysDictTypeService.java (94%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/service/ISysMenuService.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/service/ISysRoleService.java create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/service/SysMenuService.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/SysPermissionService.java (87%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/SysTaskLogsService.java (61%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/SysTaskService.java (64%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysDictDataServiceImpl.java (92%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysDictTypeServiceImpl.java (92%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysMenuServiceImpl.java (56%) create mode 100644 sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysRoleServiceImpl.java rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysTaskLogsServiceImpl.java (72%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysTaskServiceImpl.java (74%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/service/impl/SysUserServiceImpl.java (94%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/utils/DateUtils.java (99%) rename {common/src/main/java/com/qihang/common/config => sys-api/src/main/java/cn/qihangerp/sys/utils}/FastJson2JsonRedisSerializer.java (97%) rename {common/src/main/java/com/qihang/common => sys-api/src/main/java/cn/qihangerp/sys}/utils/IdUtils.java (96%) rename {common/src/main/java/com/qihang/common => sys-api/src/main/java/cn/qihangerp/sys}/utils/UUID.java (99%) rename {common/src/main/java/com/qihang/common => sys-api/src/main/java/cn/qihangerp/sys}/utils/http/HttpHelper.java (97%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/utils/ip/AddressUtils.java (100%) rename sys-api/src/main/java/{com/qihang/sys/api => cn/qihangerp/sys}/utils/ip/IpUtils.java (100%) delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/domain/SysMenu.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/domain/SysRole.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenuMetaVo.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/mapper/SysMenuMapper.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/mapper/SysRoleMapper.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/service/SysMenuService.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/service/SysRoleService.java delete mode 100644 sys-api/src/main/java/com/qihang/sys/api/service/impl/SysRoleServiceImpl.java create mode 100644 sys-api/src/main/resources/mapper/SysDeptMapper.xml create mode 100644 sys-api/src/main/resources/mapper/SysRoleMenuMapper.xml create mode 100644 sys-api/src/main/resources/mapper/SysUserRoleMapper.xml create mode 100644 vue/src/api/goods/supplier.js create mode 100644 vue/src/api/offline/goodsSku.js create mode 100644 vue/src/api/offline/order.js create mode 100644 vue/src/api/offline/refund.js create mode 100644 vue/src/api/offline/ship.js create mode 100644 vue/src/api/offline/shop.js create mode 100644 vue/src/views/dou/goods/index.vue create mode 100644 vue/src/views/dou/order/index.vue create mode 100644 vue/src/views/goods/brand/index.vue create mode 100644 vue/src/views/goods/category/categoryAttribute.vue create mode 100644 vue/src/views/goods/category/categoryAttributeValue.vue create mode 100644 vue/src/views/goods/category/index.vue create mode 100644 vue/src/views/goods/create.vue create mode 100644 vue/src/views/goods/goodsInventory/index.vue create mode 100644 vue/src/views/goods/index.vue create mode 100644 vue/src/views/goods/shopGoods/index.vue create mode 100644 vue/src/views/goods/spec/index.vue create mode 100644 vue/src/views/goods/supplier/index.vue create mode 100644 vue/src/views/offline/aftersale/index.vue create mode 100644 vue/src/views/offline/goods/index.vue create mode 100644 vue/src/views/offline/order/create.vue create mode 100644 vue/src/views/offline/order/index.vue create mode 100644 vue/src/views/offline/shop/index.vue create mode 100644 vue/src/views/pdd/goods/index.vue create mode 100644 vue/src/views/pdd/order/index.vue create mode 100644 vue/src/views/pdd/refund/index.vue create mode 100644 vue/src/views/wei/goods/index.vue create mode 100644 vue/src/views/wei/order/index.vue create mode 100644 vue/src/views/wei/order/pull_log.vue create mode 100644 vue/src/views/wei/refund/index.vue diff --git a/README.md b/README.md index fec614ef..213d90aa 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,11 @@ graph TD `java -Dserver.port=8888 -Dcsp.sentinel.dashboard.server=localhost:8888 -Dproject.name=sentinel-dashboard -jar sentinel-dashboard.jar` +#### 启动KRaft模式kafka ++ 0 进入kafka解压目录 ++ 1 生成UUID`bin\windows\kafka-storage.bat random-uuid` ++ 2 格式化`bin\windows\kafka-storage.bat format -t ujpyXZx-S9-jGlwxgORmow -c config\kraft\server.properties` ++ 3 启动`bin\windows\kafka-server-start.bat config\kraft\server.properties` ### 2、项目结构 #### 2.1 core diff --git a/common/src/main/java/com/qihang/common/App.java b/common/src/main/java/cn/qihangerp/common/App.java similarity index 84% rename from common/src/main/java/com/qihang/common/App.java rename to common/src/main/java/cn/qihangerp/common/App.java index 7db512ed..e46ade19 100644 --- a/common/src/main/java/com/qihang/common/App.java +++ b/common/src/main/java/cn/qihangerp/common/App.java @@ -1,4 +1,4 @@ -package com.qihang.common; +package cn.qihangerp.common; /** * Hello world! diff --git a/common/src/main/java/com/qihang/common/common/PageQuery.java b/common/src/main/java/cn/qihangerp/common/PageQuery.java similarity index 96% rename from common/src/main/java/com/qihang/common/common/PageQuery.java rename to common/src/main/java/cn/qihangerp/common/PageQuery.java index f091122f..b9830387 100644 --- a/common/src/main/java/com/qihang/common/common/PageQuery.java +++ b/common/src/main/java/cn/qihangerp/common/PageQuery.java @@ -1,5 +1,6 @@ -package com.qihang.common.common; +package cn.qihangerp.common; +import cn.qihangerp.common.common.ServiceException; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/common/src/main/java/com/qihang/common/common/PageResult.java b/common/src/main/java/cn/qihangerp/common/PageResult.java similarity index 93% rename from common/src/main/java/com/qihang/common/common/PageResult.java rename to common/src/main/java/cn/qihangerp/common/PageResult.java index a7ef9e46..370f37f8 100644 --- a/common/src/main/java/com/qihang/common/common/PageResult.java +++ b/common/src/main/java/cn/qihangerp/common/PageResult.java @@ -1,7 +1,7 @@ -package com.qihang.common.common; +package cn.qihangerp.common; +import cn.qihangerp.common.enums.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.qihang.common.enums.HttpStatus; import lombok.Data; import java.io.Serializable; diff --git a/common/src/main/java/com/qihang/common/common/ResultVo.java b/common/src/main/java/cn/qihangerp/common/ResultVo.java similarity index 98% rename from common/src/main/java/com/qihang/common/common/ResultVo.java rename to common/src/main/java/cn/qihangerp/common/ResultVo.java index 259185e7..fac5d454 100644 --- a/common/src/main/java/com/qihang/common/common/ResultVo.java +++ b/common/src/main/java/cn/qihangerp/common/ResultVo.java @@ -1,4 +1,4 @@ -package com.qihang.common.common; +package cn.qihangerp.common; import lombok.Data; diff --git a/common/src/main/java/com/qihang/common/common/ResultVoEnum.java b/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java similarity index 98% rename from common/src/main/java/com/qihang/common/common/ResultVoEnum.java rename to common/src/main/java/cn/qihangerp/common/ResultVoEnum.java index ca6b8a9d..bf3570c2 100644 --- a/common/src/main/java/com/qihang/common/common/ResultVoEnum.java +++ b/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java @@ -1,4 +1,4 @@ -package com.qihang.common.common; +package cn.qihangerp.common; /** * 描述： * 结果枚举 diff --git a/common/src/main/java/com/qihang/common/api/ShopApiParams.java b/common/src/main/java/cn/qihangerp/common/api/ShopApiParams.java similarity index 88% rename from common/src/main/java/com/qihang/common/api/ShopApiParams.java rename to common/src/main/java/cn/qihangerp/common/api/ShopApiParams.java index ca6513dd..3b7fc337 100644 --- a/common/src/main/java/com/qihang/common/api/ShopApiParams.java +++ b/common/src/main/java/cn/qihangerp/common/api/ShopApiParams.java @@ -1,4 +1,4 @@ -package com.qihang.common.api; +package cn.qihangerp.common.api; import lombok.Data; diff --git a/common/src/main/java/com/qihang/common/bo/LinkErpGoodsSkuBo.java b/common/src/main/java/cn/qihangerp/common/bo/LinkErpGoodsSkuBo.java similarity index 82% rename from common/src/main/java/com/qihang/common/bo/LinkErpGoodsSkuBo.java rename to common/src/main/java/cn/qihangerp/common/bo/LinkErpGoodsSkuBo.java index b9963ed3..a9ee8259 100644 --- a/common/src/main/java/com/qihang/common/bo/LinkErpGoodsSkuBo.java +++ b/common/src/main/java/cn/qihangerp/common/bo/LinkErpGoodsSkuBo.java @@ -1,4 +1,4 @@ -package com.qihang.common.bo; +package cn.qihangerp.common.bo; import lombok.Data; diff --git a/common/src/main/java/com/qihang/common/common/AjaxResult.java b/common/src/main/java/cn/qihangerp/common/common/AjaxResult.java similarity index 98% rename from common/src/main/java/com/qihang/common/common/AjaxResult.java rename to common/src/main/java/cn/qihangerp/common/common/AjaxResult.java index dd31bb67..46361f94 100644 --- a/common/src/main/java/com/qihang/common/common/AjaxResult.java +++ b/common/src/main/java/cn/qihangerp/common/common/AjaxResult.java @@ -1,7 +1,7 @@ -package com.qihang.common.common; +package cn.qihangerp.common.common; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.enums.HttpStatus; import java.util.HashMap; import java.util.Objects; diff --git a/common/src/main/java/com/qihang/common/common/ApiResult.java b/common/src/main/java/cn/qihangerp/common/common/ApiResult.java similarity index 100% rename from common/src/main/java/com/qihang/common/common/ApiResult.java rename to common/src/main/java/cn/qihangerp/common/common/ApiResult.java diff --git a/common/src/main/java/com/qihang/common/common/CharsetKit.java b/common/src/main/java/cn/qihangerp/common/common/CharsetKit.java similarity index 96% rename from common/src/main/java/com/qihang/common/common/CharsetKit.java rename to common/src/main/java/cn/qihangerp/common/common/CharsetKit.java index d48387eb..355042af 100644 --- a/common/src/main/java/com/qihang/common/common/CharsetKit.java +++ b/common/src/main/java/cn/qihangerp/common/common/CharsetKit.java @@ -1,6 +1,6 @@ -package com.qihang.common.common; +package cn.qihangerp.common.common; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.StringUtils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/common/src/main/java/com/qihang/common/common/R.java b/common/src/main/java/cn/qihangerp/common/common/R.java similarity index 100% rename from common/src/main/java/com/qihang/common/common/R.java rename to common/src/main/java/cn/qihangerp/common/common/R.java diff --git a/common/src/main/java/com/qihang/common/common/ServiceException.java b/common/src/main/java/cn/qihangerp/common/common/ServiceException.java similarity index 97% rename from common/src/main/java/com/qihang/common/common/ServiceException.java rename to common/src/main/java/cn/qihangerp/common/common/ServiceException.java index 06751af4..105c85a2 100644 --- a/common/src/main/java/com/qihang/common/common/ServiceException.java +++ b/common/src/main/java/cn/qihangerp/common/common/ServiceException.java @@ -1,4 +1,4 @@ -package com.qihang.common.common; +package cn.qihangerp.common.common; /** * 业务异常 diff --git a/common/src/main/java/com/qihang/common/common/ServletUtils.java b/common/src/main/java/cn/qihangerp/common/common/ServletUtils.java similarity index 100% rename from common/src/main/java/com/qihang/common/common/ServletUtils.java rename to common/src/main/java/cn/qihangerp/common/common/ServletUtils.java diff --git a/common/src/main/java/com/qihang/common/common/TableDataInfo.java b/common/src/main/java/cn/qihangerp/common/common/TableDataInfo.java similarity index 97% rename from common/src/main/java/com/qihang/common/common/TableDataInfo.java rename to common/src/main/java/cn/qihangerp/common/common/TableDataInfo.java index f220ed04..a2f58cc6 100644 --- a/common/src/main/java/com/qihang/common/common/TableDataInfo.java +++ b/common/src/main/java/cn/qihangerp/common/common/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.qihang.common.common; +package cn.qihangerp.common.common; import java.io.Serializable; import java.util.List; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/FastJson2JsonRedisSerializer.java b/common/src/main/java/cn/qihangerp/common/config/FastJson2JsonRedisSerializer.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/utils/FastJson2JsonRedisSerializer.java rename to common/src/main/java/cn/qihangerp/common/config/FastJson2JsonRedisSerializer.java index 489b40d6..f666018d 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/utils/FastJson2JsonRedisSerializer.java +++ b/common/src/main/java/cn/qihangerp/common/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.utils; +package cn.qihangerp.common.config; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; diff --git a/common/src/main/java/com/qihang/common/config/RedisCache.java b/common/src/main/java/cn/qihangerp/common/config/RedisCache.java similarity index 99% rename from common/src/main/java/com/qihang/common/config/RedisCache.java rename to common/src/main/java/cn/qihangerp/common/config/RedisCache.java index 9b8296d7..b964195d 100644 --- a/common/src/main/java/com/qihang/common/config/RedisCache.java +++ b/common/src/main/java/cn/qihangerp/common/config/RedisCache.java @@ -1,4 +1,4 @@ -package com.qihang.common.config; +package cn.qihangerp.common.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; diff --git a/common/src/main/java/com/qihang/common/config/RedisConfig.java b/common/src/main/java/cn/qihangerp/common/config/RedisConfig.java similarity index 98% rename from common/src/main/java/com/qihang/common/config/RedisConfig.java rename to common/src/main/java/cn/qihangerp/common/config/RedisConfig.java index 06d4c685..4400f4d6 100644 --- a/common/src/main/java/com/qihang/common/config/RedisConfig.java +++ b/common/src/main/java/cn/qihangerp/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.qihang.common.config; +package cn.qihangerp.common.config; import org.springframework.cache.annotation.CachingConfigurerSupport; diff --git a/common/src/main/java/com/qihang/common/constant/CacheConstants.java b/common/src/main/java/cn/qihangerp/common/constant/CacheConstants.java similarity index 95% rename from common/src/main/java/com/qihang/common/constant/CacheConstants.java rename to common/src/main/java/cn/qihangerp/common/constant/CacheConstants.java index 7709d9eb..ad23ceaf 100644 --- a/common/src/main/java/com/qihang/common/constant/CacheConstants.java +++ b/common/src/main/java/cn/qihangerp/common/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.qihang.common.constant; +package cn.qihangerp.common.constant; /** * 缓存的key 常量 diff --git a/common/src/main/java/com/qihang/common/constant/Constants.java b/common/src/main/java/cn/qihangerp/common/constant/Constants.java similarity index 98% rename from common/src/main/java/com/qihang/common/constant/Constants.java rename to common/src/main/java/cn/qihangerp/common/constant/Constants.java index 895a8c26..a10260b7 100644 --- a/common/src/main/java/com/qihang/common/constant/Constants.java +++ b/common/src/main/java/cn/qihangerp/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.qihang.common.constant; +package cn.qihangerp.common.constant; import io.jsonwebtoken.Claims; diff --git a/common/src/main/java/com/qihang/common/constant/Convert.java b/common/src/main/java/cn/qihangerp/common/constant/Convert.java similarity index 99% rename from common/src/main/java/com/qihang/common/constant/Convert.java rename to common/src/main/java/cn/qihangerp/common/constant/Convert.java index d3fd20cc..0982b100 100644 --- a/common/src/main/java/com/qihang/common/constant/Convert.java +++ b/common/src/main/java/cn/qihangerp/common/constant/Convert.java @@ -1,7 +1,7 @@ -package com.qihang.common.constant; +package cn.qihangerp.common.constant; -import com.qihang.common.common.CharsetKit; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.common.CharsetKit; +import cn.qihangerp.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; import java.math.BigDecimal; diff --git a/common/src/main/java/com/qihang/common/constant/StrFormatter.java b/common/src/main/java/cn/qihangerp/common/constant/StrFormatter.java similarity index 97% rename from common/src/main/java/com/qihang/common/constant/StrFormatter.java rename to common/src/main/java/cn/qihangerp/common/constant/StrFormatter.java index 2fd0adce..ecfa773e 100644 --- a/common/src/main/java/com/qihang/common/constant/StrFormatter.java +++ b/common/src/main/java/cn/qihangerp/common/constant/StrFormatter.java @@ -1,7 +1,7 @@ -package com.qihang.common.constant; +package cn.qihangerp.common.constant; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.StringUtils; /** * 字符串格式化 diff --git a/common/src/main/java/com/qihang/common/constant/UserConstants.java b/common/src/main/java/cn/qihangerp/common/constant/UserConstants.java similarity index 98% rename from common/src/main/java/com/qihang/common/constant/UserConstants.java rename to common/src/main/java/cn/qihangerp/common/constant/UserConstants.java index 9077c961..99dc318a 100644 --- a/common/src/main/java/com/qihang/common/constant/UserConstants.java +++ b/common/src/main/java/cn/qihangerp/common/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.qihang.common.constant; +package cn.qihangerp.common.constant; /** * 用户常量信息 diff --git a/common/src/main/java/com/qihang/common/enums/EnumShopType.java b/common/src/main/java/cn/qihangerp/common/enums/EnumShopType.java similarity index 96% rename from common/src/main/java/com/qihang/common/enums/EnumShopType.java rename to common/src/main/java/cn/qihangerp/common/enums/EnumShopType.java index 3ae50d39..3b8f5a8d 100644 --- a/common/src/main/java/com/qihang/common/enums/EnumShopType.java +++ b/common/src/main/java/cn/qihangerp/common/enums/EnumShopType.java @@ -1,4 +1,4 @@ -package com.qihang.common.enums; +package cn.qihangerp.common.enums; /** * 描述： diff --git a/common/src/main/java/com/qihang/common/enums/HttpStatus.java b/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java similarity index 96% rename from common/src/main/java/com/qihang/common/enums/HttpStatus.java rename to common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java index 8cc45ec7..de6f8eee 100644 --- a/common/src/main/java/com/qihang/common/enums/HttpStatus.java +++ b/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java @@ -1,4 +1,4 @@ -package com.qihang.common.enums;//package com.qihang.oms.api.common; +package cn.qihangerp.common.enums;//package com.qihang.oms.api.common; /** * 返回状态码 diff --git a/common/src/main/java/com/qihang/common/enums/JdOrderStateEnum.java b/common/src/main/java/cn/qihangerp/common/enums/JdOrderStateEnum.java similarity index 97% rename from common/src/main/java/com/qihang/common/enums/JdOrderStateEnum.java rename to common/src/main/java/cn/qihangerp/common/enums/JdOrderStateEnum.java index adfe603c..ac59ef83 100644 --- a/common/src/main/java/com/qihang/common/enums/JdOrderStateEnum.java +++ b/common/src/main/java/cn/qihangerp/common/enums/JdOrderStateEnum.java @@ -1,4 +1,4 @@ -package com.qihang.common.enums; +package cn.qihangerp.common.enums; /** * 描述： diff --git a/common/src/main/java/com/qihang/common/enums/TaoOrderStateEnum.java b/common/src/main/java/cn/qihangerp/common/enums/TaoOrderStateEnum.java similarity index 98% rename from common/src/main/java/com/qihang/common/enums/TaoOrderStateEnum.java rename to common/src/main/java/cn/qihangerp/common/enums/TaoOrderStateEnum.java index 69625c5c..a2b32eee 100644 --- a/common/src/main/java/com/qihang/common/enums/TaoOrderStateEnum.java +++ b/common/src/main/java/cn/qihangerp/common/enums/TaoOrderStateEnum.java @@ -1,4 +1,4 @@ -package com.qihang.common.enums; +package cn.qihangerp.common.enums; /** * 描述： diff --git a/common/src/main/java/com/qihang/common/enums/UserStatus.java b/common/src/main/java/cn/qihangerp/common/enums/UserStatus.java similarity index 92% rename from common/src/main/java/com/qihang/common/enums/UserStatus.java rename to common/src/main/java/cn/qihangerp/common/enums/UserStatus.java index 961fb6f3..39bb30ef 100644 --- a/common/src/main/java/com/qihang/common/enums/UserStatus.java +++ b/common/src/main/java/cn/qihangerp/common/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.qihang.common.enums; +package cn.qihangerp.common.enums; /** * 用户状态 diff --git a/common/src/main/java/com/qihang/common/exception/BaseException.java b/common/src/main/java/cn/qihangerp/common/exception/BaseException.java similarity index 92% rename from common/src/main/java/com/qihang/common/exception/BaseException.java rename to common/src/main/java/cn/qihangerp/common/exception/BaseException.java index 3cb8c51b..531029da 100644 --- a/common/src/main/java/com/qihang/common/exception/BaseException.java +++ b/common/src/main/java/cn/qihangerp/common/exception/BaseException.java @@ -1,8 +1,8 @@ -package com.qihang.common.exception; +package cn.qihangerp.common.exception; -import com.qihang.common.utils.MessageUtils; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.MessageUtils; +import cn.qihangerp.common.utils.StringUtils; /** * 基础异常 diff --git a/common/src/main/java/com/qihang/common/exception/UserException.java b/common/src/main/java/cn/qihangerp/common/exception/UserException.java similarity index 87% rename from common/src/main/java/com/qihang/common/exception/UserException.java rename to common/src/main/java/cn/qihangerp/common/exception/UserException.java index 7249b1cb..a3210111 100644 --- a/common/src/main/java/com/qihang/common/exception/UserException.java +++ b/common/src/main/java/cn/qihangerp/common/exception/UserException.java @@ -1,4 +1,4 @@ -package com.qihang.common.exception; +package cn.qihangerp.common.exception; diff --git a/common/src/main/java/com/qihang/common/exception/UserNotExistsException.java b/common/src/main/java/cn/qihangerp/common/exception/UserNotExistsException.java similarity index 87% rename from common/src/main/java/com/qihang/common/exception/UserNotExistsException.java rename to common/src/main/java/cn/qihangerp/common/exception/UserNotExistsException.java index 920f27f0..90606a99 100644 --- a/common/src/main/java/com/qihang/common/exception/UserNotExistsException.java +++ b/common/src/main/java/cn/qihangerp/common/exception/UserNotExistsException.java @@ -1,4 +1,4 @@ -package com.qihang.common.exception; +package cn.qihangerp.common.exception; /** * 用户不存在异常类 diff --git a/common/src/main/java/com/qihang/common/mq/MqMessage.java b/common/src/main/java/cn/qihangerp/common/mq/MqMessage.java similarity index 92% rename from common/src/main/java/com/qihang/common/mq/MqMessage.java rename to common/src/main/java/cn/qihangerp/common/mq/MqMessage.java index 8316df3e..dc3345ba 100644 --- a/common/src/main/java/com/qihang/common/mq/MqMessage.java +++ b/common/src/main/java/cn/qihangerp/common/mq/MqMessage.java @@ -1,10 +1,8 @@ -package com.qihang.common.mq; +package cn.qihangerp.common.mq; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.enums.EnumShopType; import lombok.Data; -import java.util.List; - @Data public class MqMessage { private int mqType;// 消息类型（1：订单消息；2：退款消息） diff --git a/common/src/main/java/com/qihang/common/mq/MqType.java b/common/src/main/java/cn/qihangerp/common/mq/MqType.java similarity index 94% rename from common/src/main/java/com/qihang/common/mq/MqType.java rename to common/src/main/java/cn/qihangerp/common/mq/MqType.java index f035b687..eec80f40 100644 --- a/common/src/main/java/com/qihang/common/mq/MqType.java +++ b/common/src/main/java/cn/qihangerp/common/mq/MqType.java @@ -1,4 +1,4 @@ -package com.qihang.common.mq; +package cn.qihangerp.common.mq; public class MqType { /** diff --git a/common/src/main/java/com/qihang/common/mq/MqUtils.java b/common/src/main/java/cn/qihangerp/common/mq/MqUtils.java similarity index 93% rename from common/src/main/java/com/qihang/common/mq/MqUtils.java rename to common/src/main/java/cn/qihangerp/common/mq/MqUtils.java index 12e7369b..1bc31ece 100644 --- a/common/src/main/java/com/qihang/common/mq/MqUtils.java +++ b/common/src/main/java/cn/qihangerp/common/mq/MqUtils.java @@ -1,4 +1,4 @@ -package com.qihang.common.mq; +package cn.qihangerp.common.mq; import lombok.AllArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; diff --git a/common/src/main/java/com/qihang/common/task/IPollableService.java b/common/src/main/java/cn/qihangerp/common/task/IPollableService.java similarity index 92% rename from common/src/main/java/com/qihang/common/task/IPollableService.java rename to common/src/main/java/cn/qihangerp/common/task/IPollableService.java index 7d18bdbd..3010101e 100644 --- a/common/src/main/java/com/qihang/common/task/IPollableService.java +++ b/common/src/main/java/cn/qihangerp/common/task/IPollableService.java @@ -1,4 +1,4 @@ -package com.qihang.common.task; +package cn.qihangerp.common.task; public interface IPollableService { /** diff --git a/common/src/main/java/com/qihang/common/task/SchedulingConfiguration.java b/common/src/main/java/cn/qihangerp/common/task/SchedulingConfiguration.java similarity index 99% rename from common/src/main/java/com/qihang/common/task/SchedulingConfiguration.java rename to common/src/main/java/cn/qihangerp/common/task/SchedulingConfiguration.java index 18fa7c77..eb74b54b 100644 --- a/common/src/main/java/com/qihang/common/task/SchedulingConfiguration.java +++ b/common/src/main/java/cn/qihangerp/common/task/SchedulingConfiguration.java @@ -1,4 +1,4 @@ -package com.qihang.common.task; +package cn.qihangerp.common.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/qihang/common/utils/DateUtils.java b/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java similarity index 99% rename from common/src/main/java/com/qihang/common/utils/DateUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/DateUtils.java index 3157d40c..d92d98c4 100644 --- a/common/src/main/java/com/qihang/common/utils/DateUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils; +package cn.qihangerp.common.utils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/IdUtils.java b/common/src/main/java/cn/qihangerp/common/utils/IdUtils.java similarity index 96% rename from sys-api/src/main/java/com/qihang/sys/api/utils/IdUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/IdUtils.java index b4f4dfbc..38206450 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/utils/IdUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/IdUtils.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.utils; +package cn.qihangerp.common.utils; /** * ID生成器工具类 diff --git a/common/src/main/java/com/qihang/common/utils/MessageUtils.java b/common/src/main/java/cn/qihangerp/common/utils/MessageUtils.java similarity index 94% rename from common/src/main/java/com/qihang/common/utils/MessageUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/MessageUtils.java index 07cb1722..d19430fa 100644 --- a/common/src/main/java/com/qihang/common/utils/MessageUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils; +package cn.qihangerp.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/common/src/main/java/com/qihang/common/utils/SpringUtils.java b/common/src/main/java/cn/qihangerp/common/utils/SpringUtils.java similarity index 99% rename from common/src/main/java/com/qihang/common/utils/SpringUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/SpringUtils.java index 3dd63b6d..af82da1f 100644 --- a/common/src/main/java/com/qihang/common/utils/SpringUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils; +package cn.qihangerp.common.utils; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; diff --git a/common/src/main/java/com/qihang/common/utils/StringUtils.java b/common/src/main/java/cn/qihangerp/common/utils/StringUtils.java similarity index 99% rename from common/src/main/java/com/qihang/common/utils/StringUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/StringUtils.java index b86cfe82..32fcb825 100644 --- a/common/src/main/java/com/qihang/common/utils/StringUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/StringUtils.java @@ -1,7 +1,7 @@ -package com.qihang.common.utils; +package cn.qihangerp.common.utils; -import com.qihang.common.constant.Constants; -import com.qihang.common.constant.StrFormatter; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.common.constant.StrFormatter; import java.util.*; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/UUID.java b/common/src/main/java/cn/qihangerp/common/utils/UUID.java similarity index 99% rename from sys-api/src/main/java/com/qihang/sys/api/utils/UUID.java rename to common/src/main/java/cn/qihangerp/common/utils/UUID.java index 030bb2b4..a602faee 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/utils/UUID.java +++ b/common/src/main/java/cn/qihangerp/common/utils/UUID.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.utils; +package cn.qihangerp.common.utils; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/http/HttpHelper.java b/common/src/main/java/cn/qihangerp/common/utils/http/HttpHelper.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/utils/http/HttpHelper.java rename to common/src/main/java/cn/qihangerp/common/utils/http/HttpHelper.java index bcd746d5..659c2a18 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/utils/http/HttpHelper.java +++ b/common/src/main/java/cn/qihangerp/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.utils.http; +package cn.qihangerp.common.utils.http; import jakarta.servlet.ServletRequest; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/common/src/main/java/com/qihang/common/utils/http/HttpUtils.java b/common/src/main/java/cn/qihangerp/common/utils/http/HttpUtils.java similarity index 98% rename from common/src/main/java/com/qihang/common/utils/http/HttpUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/http/HttpUtils.java index 0449ff03..8c1f45f8 100644 --- a/common/src/main/java/com/qihang/common/utils/http/HttpUtils.java +++ b/common/src/main/java/cn/qihangerp/common/utils/http/HttpUtils.java @@ -1,7 +1,7 @@ -package com.qihang.common.utils.http; +package cn.qihangerp.common.utils.http; -import com.qihang.common.constant.Constants; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.common.constant.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/com/qihang/common/utils/ip/AddressUtils.java b/common/src/main/java/cn/qihangerp/common/utils/ip/AddressUtils.java similarity index 100% rename from common/src/main/java/com/qihang/common/utils/ip/AddressUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/ip/AddressUtils.java diff --git a/common/src/main/java/com/qihang/common/utils/ip/IpUtils.java b/common/src/main/java/cn/qihangerp/common/utils/ip/IpUtils.java similarity index 100% rename from common/src/main/java/com/qihang/common/utils/ip/IpUtils.java rename to common/src/main/java/cn/qihangerp/common/utils/ip/IpUtils.java diff --git a/gateway/src/main/resources/application.yaml b/gateway/src/main/resources/application.yaml index 3bbc16f0..489f7494 100644 --- a/gateway/src/main/resources/application.yaml +++ b/gateway/src/main/resources/application.yaml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8088 spring: application: name: gateway @@ -13,8 +13,8 @@ spring: nacos: discovery: server-addr: 127.0.0.1:8848 -# username: nacos -# password: nacos + username: nacos + password: nacos sentinel: transport: dashboard: 127.0.0.1:8888 # sentinel控制台地址 diff --git a/goods/pom.xml b/goods/pom.xml new file mode 100644 index 00000000..61076ab2 --- /dev/null +++ b/goods/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + cn.qihangerp + qihangerp-cloud + 2.0.6 + + + cn.qihangerp.module + goods + jar + + goods + http://maven.apache.org + + + UTF-8 + + + + + cn.qihangerp + common + 2.0.6 + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + compile + + + diff --git a/goods/src/main/java/cn/qihangerp/module/App.java b/goods/src/main/java/cn/qihangerp/module/App.java new file mode 100644 index 00000000..06eca50c --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/App.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/a.java b/goods/src/main/java/cn/qihangerp/module/goods/a.java new file mode 100644 index 00000000..c6ea7b9a --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/a.java @@ -0,0 +1,4 @@ +package cn.qihangerp.module.goods; + +public class a { +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java new file mode 100644 index 00000000..e1de4124 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java @@ -0,0 +1,216 @@ +package cn.qihangerp.module.goods.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 商品库存管理 + * @TableName o_goods + */ +@Data +public class OGoods implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type= IdType.AUTO) + private String id; + + /** + * 商品名称 + */ + private String name; + + /** + * 商品图片地址 + */ + private String image; + + /** + * 商品唯一ID + */ + private String outerErpGoodsId; + + /** + * 商品编号 + */ + private String goodsNum; + + /** + * 单位名称 + */ + private String unitName; + /**发货地*/ + private String province; + private String city; + private String town; + + /** + * 商品分类ID + */ + private Long categoryId; + + /** + * 条码 + */ + private String barCode; + + /** + * 备注 + */ + private String remark; + + /** + * 状态1销售中2已下架 + */ + private Integer status; + + /** + * 衣长/裙长/裤长 + */ + private Double length; + + /** + * 高度/袖长 + */ + private Double height; + + /** + * 宽度/胸阔(围) + */ + private Double width; + + /** + * 肩阔 + */ + private Double width1; + + /** + * 腰阔 + */ + private Double width2; + + /** + * 臀阔 + */ + private Double width3; + + /** + * 重量 + */ + private Double weight; + + /** + * 0启用 1禁用 + */ + private Integer disable; + + /** + * 保质期 + */ + private String period; + + /** + * 预计采购价格 + */ + private BigDecimal purPrice; + + /** + * 建议批发价 + */ + private BigDecimal wholePrice; + + /** + * 建议零售价 + */ + private BigDecimal retailPrice; + + /** + * 单位成本 + */ + private BigDecimal unitCost; + + /** + * 供应商id + */ + private Long supplierId; + + /** + * 品牌id + */ + private Long brandId; + + /** + * 属性1：季节 + */ + private String attr1; + + /** + * 属性2：分类 + */ + private String attr2; + + /** + * 属性3：风格 + */ + private String attr3; + + /** + * 属性4：年份 + */ + private String attr4; + + /** + * 属性5：面料 + */ + private String attr5; + + /** + * 外链url + */ + private String linkUrl; + + /** + * 最低库存（预警） + */ + private Integer lowQty; + + /** + * 最高库存（预警） + */ + private Integer highQty; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + @TableField(exist = false) + private List skuList; + + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java new file mode 100644 index 00000000..23ae7485 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java @@ -0,0 +1,49 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName o_goods_brand + */ +@Data +public class OGoodsBrand implements Serializable { + /** + * 主键ID + */ + private Integer id; + + /** + * 品牌名 + */ + private String name; + + /** + * 状态 + */ + private Integer status; + + /** + * + */ + private String createBy; + + /** + * + */ + private Date createTime; + + /** + * + */ + private String updateBy; + + /** + * + */ + private Date updateTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java new file mode 100644 index 00000000..ed1dfd88 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java @@ -0,0 +1,83 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * + * @TableName o_goods_category + */ +@Data +public class OGoodsCategory implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 分类编码 + */ + private String number; + + /** + * 分类名称 + */ + private String name; + + /** + * + */ + private String remark; + + /** + * 上架分类id + */ + private Long parentId; + + /** + * 分类路径 + */ + private String path; + + /** + * 排序值 + */ + private Integer sort; + + /** + * 图片 + */ + private String image; + + /** + * 0正常 1删除 + */ + private Integer isdelete; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java new file mode 100644 index 00000000..4e2a3a9b --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java @@ -0,0 +1,42 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * + * @TableName o_goods_category_attribute + */ +@Data +public class OGoodsCategoryAttribute implements Serializable { + /** + * 主键id + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * + */ + private Long categoryId; + + /** + * 类型：0属性1规格 + */ + private Integer type; + + /** + * '属性名' + */ + private String title; + + /** + * 固定值color颜色size尺码style款式 + */ + private String code; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java new file mode 100644 index 00000000..28de36c2 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java @@ -0,0 +1,47 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * + * @TableName o_goods_category_attribute_value + */ +@Data +public class OGoodsCategoryAttributeValue implements Serializable { + /** + * 主键，属性值id + */ + @TableId(type = IdType.AUTO) + private Integer id; + + /** + * 属性id + */ + private Long categoryAttributeId; + + /** + * 属性值文本 + */ + private String value; + + /** + * 生成SKU的编码 + */ + private String skuCode; + + /** + * + */ + private Integer ordernum; + + /** + * + */ + private Integer isdelete; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java new file mode 100644 index 00000000..ec3d8286 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java @@ -0,0 +1,69 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品库存表 + * @TableName o_goods_inventory + */ +@Data +public class OGoodsInventory implements Serializable { + /** + * 主键ID + */ + private String id; + + /** + * 商品id + */ + private String goodsId; + + /** + * 商品编码 + */ + private String goodsNum; + + /** + * 商品规格id + */ + private String skuId; + + /** + * 规格编码（唯一） + */ + private String skuCode; + + /** + * 当前库存 + */ + private Long quantity; + + /** + * 0正常 1删除 + */ + private Integer isDelete; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateBy; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java new file mode 100644 index 00000000..c8d1e8a2 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java @@ -0,0 +1,99 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品库存批次 + * @TableName o_goods_inventory_batch + */ +@Data +public class OGoodsInventoryBatch implements Serializable { + /** + * 主键ID + */ + private Long id; + + /** + * 批次号 + */ + private String batchNum; + + /** + * 初始数量 + */ + private Long originQty; + + /** + * 当前数量 + */ + private Long currentQty; + + /** + * 采购价 + */ + private Double purPrice; + + /** + * 采购单id + */ + private Long purId; + + /** + * 采购单itemId + */ + private Long purItemId; + + /** + * 备注 + */ + private String remark; + + /** + * 规格id + */ + private String skuId; + + /** + * 商品id + */ + private String goodsId; + + /** + * sku编码 + */ + private String skuCode; + + /** + * 仓库id + */ + private Long warehouseId; + + /** + * 仓位id + */ + private Long positionId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateBy; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java new file mode 100644 index 00000000..e91da3f9 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java @@ -0,0 +1,122 @@ +package cn.qihangerp.module.goods.domain; + +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 商品规格库存管理 + * @TableName o_goods_sku + */ +@Data +public class OGoodsSku implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type= IdType.AUTO) + private String id; + private String goodsId; + + /** + * 商品id + */ + private String outerErpGoodsId; + + + /** + * skuId(唯一) + */ + private String outerErpSkuId; + private String goodsName; + + /** + * 规格名 + */ + private String skuName; + + /** + * 规格编码 + */ + private String skuCode; + + /** + * 颜色id + */ + private Long colorId; + + /** + * 颜色值 + */ + private String colorValue; + + /** + * 颜色图片 + */ + private String colorImage; + + /** + * 尺码id + */ + private Long sizeId; + + /** + * 尺码值 + */ + private String sizeValue; + + /** + * 款式id + */ + private Long styleId; + + /** + * 款式值 + */ + private String styleValue; + + /** + * 库存条形码 + */ + private String barCode; + + + /** + * 建议零售价 + */ + private BigDecimal retailPrice; + private BigDecimal purPrice; + + /** + * 单位成本 + */ + private BigDecimal unitCost; + + /** + * 备注 + */ + private String remark; + + /** + * 状态 + */ + private Integer status; + + /** + * 最低库存（预警） + */ + private Integer lowQty; + + /** + * 最高库存（预警） + */ + private Integer highQty; + + private String volume; + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java new file mode 100644 index 00000000..2b8c5e4a --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java @@ -0,0 +1,57 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * + * @TableName o_goods_sku_attr + */ +@Data +public class OGoodsSkuAttr implements Serializable { + /** + * + */ + @TableId(value = "id", type= IdType.AUTO) + private Long id; + + /** + * + */ + private String goodsId; + + /** + * + */ + private String type; + + /** + * + */ + private String k; + + /** + * + */ + private Long kid; + + /** + * + */ + private Long vid; + + /** + * + */ + private String v; + + /** + * + */ + private String img; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java new file mode 100644 index 00000000..2b7b233d --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java @@ -0,0 +1,119 @@ +package cn.qihangerp.module.goods.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName o_goods_supplier + */ +@Data +public class OGoodsSupplier implements Serializable { + /** + * + */ + private String id; + + /** + * 供应商名称 + */ + private String name; + + /** + * 供应商编码 + */ + private String number; + + /** + * 税率 + */ + private Double taxrate; + + /** + * 期初应付款 + */ + private Double amount; + + /** + * 期初预付款 + */ + private Double periodmoney; + + /** + * 初期往来余额 + */ + private Double difmoney; + + /** + * 余额日期 + */ + private Date begindate; + + /** + * 备注 + */ + private String remark; + + /** + * 职位 + */ + private String place; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系方式 + */ + private String contact; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区县 + */ + private String county; + + /** + * 收货地址详情 + */ + private String address; + + /** + * + */ + private String pinyin; + + /** + * 0启用 1禁用 + */ + private Integer disable; + + /** + * 0正常 1删除 + */ + private Integer isdelete; + + /** + * 分管采购员 + */ + private String purchasername; + + /** + * 创建时间 + */ + private Date createtime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java new file mode 100644 index 00000000..b20751b6 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java @@ -0,0 +1,126 @@ +package cn.qihangerp.module.goods.domain.bo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +/** + * 商品管理对象 erp_goods + * + * @author qihang + * @date 2023-12-29 + */ +@Data +public class GoodsAddBo +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 商品名称 */ + private String name; + + /** 商品图片地址 */ + private String image; + + /** 商品编号 */ + private String number; + /** 外部商品id */ + private String outerErpGoodsId; + /**发货地*/ + private String province; + private String city; + private String town; + + /** 单位名称 */ + private String unitName; + + /** 商品分类ID */ + private Long categoryId; + + /** 条码 */ + private String barCode; + + /** 状态1销售中2已下架 */ + private Integer status; + +// /** 衣长/裙长/裤长 */ +// private Long length; +// +// /** 高度/袖长 */ +// private Long height; +// +// /** 宽度/胸阔(围) */ +// private Long width; +// +// /** 肩阔 */ +// private Long width1; +// +// /** 腰阔 */ +// private Long width2; +// +// /** 臀阔 */ +// private Long width3; +// +// /** 重量 */ +// private Long weight; +// +// /** 0启用 1禁用 */ +// private Integer disable; + + /** 保质期 */ + private String period; + + /** 预计采购价格 */ + private BigDecimal purPrice; + + /** 建议批发价 */ + private BigDecimal wholePrice; + + /** 建议零售价 */ + private BigDecimal retailPrice; + + /** 单位成本 */ + private BigDecimal unitCost; + + /** 供应商id */ + private Long supplierId; + + /** 品牌id */ + private Long brandId; + +// /** 属性1：季节 */ +// private String attr1; +// +// /** 属性2：分类 */ +// private String attr2; +// +// /** 属性3：风格 */ +// private String attr3; +// +// /** 属性4：年份 */ +// private String attr4; +// +// /** 属性5：面料 */ + private String attr5; + + /** 外链url */ + private String linkUrl; + +// /** 最低库存（预警） */ +// private Long lowQty; +// +// /** 最高库存（预警） */ +// private Long highQty; + + private Long[] colorValues; + private Map colorImages; +// private Map colorNames; + private Long[] sizeValues; + private Long[] styleValues; + private List specList; + +} diff --git a/oms-api/src/main/java/com/qihang/oms/vo/GoodsSpecListVo.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java similarity index 53% rename from oms-api/src/main/java/com/qihang/oms/vo/GoodsSpecListVo.java rename to goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java index 87a4744a..7eb83ef3 100644 --- a/oms-api/src/main/java/com/qihang/oms/vo/GoodsSpecListVo.java +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java @@ -1,64 +1,36 @@ -package com.qihang.oms.vo; - +package cn.qihangerp.module.goods.domain.bo; import java.math.BigDecimal; -public class GoodsSpecListVo { - - private Long id; - private Long goodsId; - - /** 商品名称 */ - private String name; - - /** 商品编号 */ - private String number; - private String specNum; +public class GoodsAddSkuBo { + private Long colorId; private String colorValue; - /** 商品图片地址 */ - private String colorImage; + private Long sizeId; private String sizeValue; + private Long styleId; private String styleValue; + + private String specNum; + private BigDecimal purPrice; - public Long getId() { - return id; + //外部ERP商品Sku Id + private String outerErpSkuId; + + public String getOuterErpSkuId() { + return outerErpSkuId; } - public void setId(Long id) { - this.id = id; + public void setOuterErpSkuId(String outerErpSkuId) { + this.outerErpSkuId = outerErpSkuId; } - public Long getGoodsId() { - return goodsId; + public Long getColorId() { + return colorId; } - public void setGoodsId(Long goodsId) { - this.goodsId = goodsId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getNumber() { - return number; - } - - public void setNumber(String number) { - this.number = number; - } - - public String getSpecNum() { - return specNum; - } - - public void setSpecNum(String specNum) { - this.specNum = specNum; + public void setColorId(Long colorId) { + this.colorId = colorId; } public String getColorValue() { @@ -69,12 +41,12 @@ public class GoodsSpecListVo { this.colorValue = colorValue; } - public String getColorImage() { - return colorImage; + public Long getSizeId() { + return sizeId; } - public void setColorImage(String colorImage) { - this.colorImage = colorImage; + public void setSizeId(Long sizeId) { + this.sizeId = sizeId; } public String getSizeValue() { @@ -85,6 +57,14 @@ public class GoodsSpecListVo { this.sizeValue = sizeValue; } + public Long getStyleId() { + return styleId; + } + + public void setStyleId(Long styleId) { + this.styleId = styleId; + } + public String getStyleValue() { return styleValue; } @@ -93,6 +73,14 @@ public class GoodsSpecListVo { this.styleValue = styleValue; } + public String getSpecNum() { + return specNum; + } + + public void setSpecNum(String specNum) { + this.specNum = specNum; + } + public BigDecimal getPurPrice() { return purPrice; } diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java new file mode 100644 index 00000000..2977a755 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java @@ -0,0 +1,19 @@ +package cn.qihangerp.module.goods.domain.bo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class GoodsSkuAddBo { + private String erpSkuId; //erp商品ID + private String erpSkuName;// erp商品名称 + private String erpSkuCode;// erp商品编码 + private BigDecimal salePrice;// erp商品零售价 + private String productSpec;// erp商品规格 + private String productColor;// erp商品颜色 + private String materialKind;// erp商品材质 + private String productVolume;// erp商品体积 + private String productPicture1;// erp商品图片地址 + private Integer productIsUse;// 是否在用 +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java b/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java new file mode 100644 index 00000000..1750b04d --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java @@ -0,0 +1,29 @@ +package cn.qihangerp.module.goods.domain.vo; + + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class GoodsSpecListVo { + + private Long skuId; +// private Long goodsId; + + /** 商品名称 */ + private String goodsName; + private String skuName; + + /** 商品编号 */ + private String outerErpSkuId; + private String skuCode; + private String colorValue; + /** 商品图片地址 */ + private String colorImage; + private String sizeValue; + private String styleValue; + private BigDecimal retailPrice; + private BigDecimal purPrice; + +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java new file mode 100644 index 00000000..be679e5f --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsBrand; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_brand】的数据库操作Mapper +* @createDate 2024-09-07 16:11:56 +* @Entity cn.qihangerp.module.goods.domain.OGoodsBrand +*/ +public interface OGoodsBrandMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java new file mode 100644 index 00000000..a889c7e5 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute】的数据库操作Mapper +* @createDate 2024-09-07 16:11:56 +* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute +*/ +public interface OGoodsCategoryAttributeMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java new file mode 100644 index 00000000..c7cc5dc3 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute_value】的数据库操作Mapper +* @createDate 2024-09-07 16:11:56 +* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue +*/ +public interface OGoodsCategoryAttributeValueMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java new file mode 100644 index 00000000..0b75f71f --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_category】的数据库操作Mapper +* @createDate 2024-09-07 16:11:56 +* @Entity cn.qihangerp.module.goods.domain.OGoodsCategory +*/ +public interface OGoodsCategoryMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java new file mode 100644 index 00000000..470049aa --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Mapper +* @createDate 2024-09-23 22:39:50 +* @Entity cn.qihangerp.module.goods.domain.OGoodsInventoryBatch +*/ +public interface OGoodsInventoryBatchMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java new file mode 100644 index 00000000..7f337fe4 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsInventory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Mapper +* @createDate 2024-09-23 22:39:50 +* @Entity cn.qihangerp.module.goods.domain.OGoodsInventory +*/ +public interface OGoodsInventoryMapper extends BaseMapper { + long getAllInventoryQuantity(); +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java new file mode 100644 index 00000000..8cf06f07 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoods; +import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +import java.util.List; + +/** +* @author TW +* @description 针对表【o_goods(商品库存管理)】的数据库操作Mapper +* @createDate 2024-03-11 14:24:49 +* @Entity cn.qihangerp.module.goods.domain.OGoods +*/ +public interface OGoodsMapper extends BaseMapper { + List searchGoodsSpec(String keyword); +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java new file mode 100644 index 00000000..d9ccd658 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_sku_attr】的数据库操作Mapper +* @createDate 2024-09-07 20:31:18 +* @Entity cn.qihangerp.module.goods.domain.OGoodsSkuAttr +*/ +public interface OGoodsSkuAttrMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java new file mode 100644 index 00000000..40bc37a6 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java @@ -0,0 +1,19 @@ +package cn.qihangerp.module.goods.mapper; + + +import cn.qihangerp.module.goods.domain.OGoodsSku; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Mapper +* @createDate 2024-03-11 14:24:49 +* @Entity cn.qihangerp.domain.OGoodsSku +*/ +public interface OGoodsSkuMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java new file mode 100644 index 00000000..7714b139 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.goods.mapper; + +import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_goods_supplier】的数据库操作Mapper +* @createDate 2024-09-07 16:35:43 +* @Entity cn.qihangerp.module.goods.domain.OGoodsSupplier +*/ +public interface OGoodsSupplierMapper extends BaseMapper { + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java new file mode 100644 index 00000000..bc06a93d --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java @@ -0,0 +1,15 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.goods.domain.OGoodsBrand; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_brand】的数据库操作Service +* @createDate 2024-09-07 16:11:56 +*/ +public interface OGoodsBrandService extends IService { + PageResult queryPageList(OGoodsBrand bo, PageQuery pageQuery); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java new file mode 100644 index 00000000..2f4004c4 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute】的数据库操作Service +* @createDate 2024-09-07 16:11:56 +*/ +public interface OGoodsCategoryAttributeService extends IService { + +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java new file mode 100644 index 00000000..daa5c481 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute_value】的数据库操作Service +* @createDate 2024-09-07 16:11:56 +*/ +public interface OGoodsCategoryAttributeValueService extends IService { + +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java new file mode 100644 index 00000000..e75f6cf9 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.module.goods.domain.OGoodsCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_category】的数据库操作Service +* @createDate 2024-09-07 16:11:56 +*/ +public interface OGoodsCategoryService extends IService { + void addCategory(OGoodsCategory category); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java new file mode 100644 index 00000000..b558267d --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Service +* @createDate 2024-09-23 22:39:50 +*/ +public interface OGoodsInventoryBatchService extends IService { + +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java new file mode 100644 index 00000000..ee28d729 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java @@ -0,0 +1,16 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.goods.domain.OGoodsInventory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Service +* @createDate 2024-09-23 22:39:50 +*/ +public interface OGoodsInventoryService extends IService { + PageResult queryPageList(OGoodsInventory bo, PageQuery pageQuery); + long getAllInventoryQuantity(); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java new file mode 100644 index 00000000..0cc539fc --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java @@ -0,0 +1,58 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; + +import cn.qihangerp.module.goods.domain.OGoods; +import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; +import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; +import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import com.baomidou.mybatisplus.extension.service.IService; + + + +import java.util.List; + +/** +* @author TW +* @description 针对表【o_goods(商品库存管理)】的数据库操作Service +* @createDate 2024-03-11 14:24:49 +*/ +public interface OGoodsService extends IService { + + PageResult querySkuPageList(OGoodsSku bo, PageQuery pageQuery); + PageResult queryPageList(OGoods bo, PageQuery pageQuery); + + List searchGoodsSpec(String keyword); + List selectGoodsList(OGoods goods); + OGoods selectGoodsById(Long id); + /** + * 新增商品管理 + * + * @param goods 商品管理 + * @return 结果 + */ + public ResultVo insertGoods(String userName , GoodsAddBo goods); + + /** + * 修改商品管理 + * + * @param goods 商品管理 + * @return 结果 + */ + public int updateGoods(OGoods goods); + + /** + * 批量删除商品管理 + * + * @param ids 需要删除的商品管理主键集合 + * @return 结果 + */ + public int deleteGoodsByIds(Long[] ids); + + int insertGoodsSku(OGoodsSku goodsSku); +// int saveGoodsSku(GoodsSkuAddBo addBo); +// int batchSaveGoodsSku(List list); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java new file mode 100644 index 00000000..dea341f0 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_sku_attr】的数据库操作Service +* @createDate 2024-09-07 20:31:18 +*/ +public interface OGoodsSkuAttrService extends IService { + +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java new file mode 100644 index 00000000..079a60e9 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java @@ -0,0 +1,16 @@ +package cn.qihangerp.module.goods.service; + + +import cn.qihangerp.module.goods.domain.OGoodsSku; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** +* @author TW +* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service +* @createDate 2024-03-11 14:24:49 +*/ +public interface OGoodsSkuService extends IService { + List searchGoodsSpec(String keyword); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java new file mode 100644 index 00000000..31ba6104 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java @@ -0,0 +1,15 @@ +package cn.qihangerp.module.goods.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_goods_supplier】的数据库操作Service +* @createDate 2024-09-07 16:35:43 +*/ +public interface OGoodsSupplierService extends IService { + PageResult queryPageList(OGoodsSupplier bo, PageQuery pageQuery); +} diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java new file mode 100644 index 00000000..f3e74b7e --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java @@ -0,0 +1,41 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.module.goods.service.OGoodsBrandService; +import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【o_goods_brand】的数据库操作Service实现 +* @createDate 2024-09-07 16:11:56 +*/ +@AllArgsConstructor +@Service +public class OGoodsBrandServiceImpl extends ServiceImpl + implements OGoodsBrandService { + private final OGoodsBrandMapper mapper; + + @Override + public PageResult queryPageList(OGoodsBrand bo, PageQuery pageQuery) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + + queryWrapper.like(StringUtils.hasText(bo.getName()), OGoodsBrand::getName, bo.getName()); + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java new file mode 100644 index 00000000..7e7fe99d --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; +import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute】的数据库操作Service实现 +* @createDate 2024-09-07 16:11:56 +*/ +@Service +public class OGoodsCategoryAttributeServiceImpl extends ServiceImpl + implements OGoodsCategoryAttributeService{ + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java new file mode 100644 index 00000000..ecbbd332 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; +import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_goods_category_attribute_value】的数据库操作Service实现 +* @createDate 2024-09-07 16:11:56 +*/ +@Service +public class OGoodsCategoryAttributeValueServiceImpl extends ServiceImpl + implements OGoodsCategoryAttributeValueService{ + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java new file mode 100644 index 00000000..07f26290 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java @@ -0,0 +1,66 @@ +package cn.qihangerp.module.goods.service.impl; + +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; +import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsCategory; +import cn.qihangerp.module.goods.service.OGoodsCategoryService; +import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + +/** +* @author qilip +* @description 针对表【o_goods_category】的数据库操作Service实现 +* @createDate 2024-09-07 16:11:56 +*/ +@AllArgsConstructor +@Service +public class OGoodsCategoryServiceImpl extends ServiceImpl + implements OGoodsCategoryService{ + private final OGoodsCategoryMapper oGoodsCategoryMapper; + private final OGoodsCategoryAttributeMapper attributeMapper; + private final OGoodsCategoryAttributeValueMapper attributeValueMapper; + @Transactional + @Override + public void addCategory(OGoodsCategory category) { + // 添加分类 + if(category.getSort()==null){ + category.setSort(0); + } + if(category.getParentId()==null){ + category.setParentId(0L); + } + category.setCreateTime(new Date()); + category.setIsdelete(0); + oGoodsCategoryMapper.insert(category); + // 如果是已经分类，添加默认规格 + if(category.getParentId()==0) { + // 添加颜色规格 + OGoodsCategoryAttribute att1 = new OGoodsCategoryAttribute(); + att1.setCategoryId(category.getId()); + att1.setType(1); + att1.setTitle("颜色"); + att1.setCode("color"); + attributeMapper.insert(att1); + // 添加颜色规格值 + OGoodsCategoryAttributeValue av1 = new OGoodsCategoryAttributeValue(); + av1.setCategoryAttributeId(att1.getId()); + av1.setValue("默认"); + av1.setSkuCode("00"); + av1.setOrdernum(0); + av1.setIsdelete(0); + attributeValueMapper.insert(av1); + + } + } +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java new file mode 100644 index 00000000..80bb3430 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; +import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Service实现 +* @createDate 2024-09-23 22:39:50 +*/ +@Service +public class OGoodsInventoryBatchServiceImpl extends ServiceImpl + implements OGoodsInventoryBatchService{ + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java new file mode 100644 index 00000000..a7f094e9 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java @@ -0,0 +1,47 @@ +package cn.qihangerp.module.goods.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsInventory; +import cn.qihangerp.module.goods.service.OGoodsInventoryService; +import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Service实现 +* @createDate 2024-09-23 22:39:50 +*/ +@AllArgsConstructor +@Service +public class OGoodsInventoryServiceImpl extends ServiceImpl + implements OGoodsInventoryService{ + private final OGoodsInventoryMapper mapper; + + @Override + public PageResult queryPageList(OGoodsInventory bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(bo.getGoodsId()!=null,OGoodsInventory::getGoodsId,bo.getGoodsId()); + queryWrapper.eq(bo.getSkuId()!=null,OGoodsInventory::getSkuId,bo.getSkuId()); + queryWrapper.eq(StringUtils.hasText(bo.getGoodsNum()),OGoodsInventory::getGoodsNum,bo.getGoodsNum()); + queryWrapper.eq(StringUtils.hasText(bo.getSkuCode()),OGoodsInventory::getSkuCode,bo.getSkuCode()); + + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + + @Override + public long getAllInventoryQuantity() { + return mapper.getAllInventoryQuantity(); + } +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java new file mode 100644 index 00000000..7a17c93b --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java @@ -0,0 +1,329 @@ +package cn.qihangerp.module.goods.service.impl; + +import cn.qihangerp.module.goods.domain.OGoodsInventory; +import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; +import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; +import cn.qihangerp.module.goods.mapper.OGoodsMapper; +import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; + + +import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; + +import cn.qihangerp.module.goods.domain.OGoods; + +import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; +import cn.qihangerp.module.goods.domain.bo.GoodsAddSkuBo; +import cn.qihangerp.module.goods.service.OGoodsService; + +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.util.Date; +import java.util.List; + +/** +* @author TW +* @description 针对表【o_goods(商品库存管理)】的数据库操作Service实现 +* @createDate 2024-03-11 14:24:49 +*/ +@AllArgsConstructor +@Service +public class OGoodsServiceImpl extends ServiceImpl + implements OGoodsService{ + private final OGoodsMapper goodsMapper; + private final OGoodsSkuMapper skuMapper; + private final OGoodsSkuAttrMapper skuAttrMapper; + private final OGoodsInventoryMapper inventoryMapper; +// private final OOrderItemMapper orderItemMapper; + + @Override + public PageResult querySkuPageList(OGoodsSku bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(bo.getStatus()!=null, OGoodsSku::getStatus,bo.getStatus()); + queryWrapper.eq(bo.getOuterErpSkuId()!=null,OGoodsSku::getOuterErpSkuId,bo.getOuterErpSkuId()); + queryWrapper.eq(bo.getOuterErpGoodsId()!=null,OGoodsSku::getOuterErpGoodsId,bo.getOuterErpGoodsId()); + queryWrapper.eq(StringUtils.hasText(bo.getSkuCode()),OGoodsSku::getSkuCode,bo.getSkuCode()); + Page pages = skuMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + + @Override + public PageResult queryPageList(OGoods bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(bo.getStatus()!=null, OGoods::getStatus,bo.getStatus()); + queryWrapper.eq(bo.getCategoryId()!=null,OGoods::getCategoryId,bo.getCategoryId()); + queryWrapper.eq(bo.getSupplierId()!=null,OGoods::getSupplierId,bo.getSupplierId()); + queryWrapper.eq(StringUtils.hasText(bo.getGoodsNum()),OGoods::getGoodsNum,bo.getGoodsNum()); + queryWrapper.like(StringUtils.hasText(bo.getName()),OGoods::getName,bo.getName()); + Page pages = goodsMapper.selectPage(pageQuery.build(), queryWrapper); + if(pages.getRecords()!=null){ + for(OGoods g:pages.getRecords()){ + g.setSkuList(skuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getGoodsId,g.getId()))); + } + } + return PageResult.build(pages); + } + + @Override + public List searchGoodsSpec(String keyword) { + return goodsMapper.searchGoodsSpec(keyword); + } + + @Override + public List selectGoodsList(OGoods goods) { + List list = goodsMapper.selectList(new LambdaQueryWrapper<>()); + return list; + } + + @Override + public OGoods selectGoodsById(Long id) { + return goodsMapper.selectById(id); + } + + @Transactional + @Override + public ResultVo insertGoods(String userName , GoodsAddBo bo) + { + if(StringUtils.isEmpty(bo.getNumber())) return ResultVo.error(500,"商品编码不能为空"); + // 查询编码是否存在 + List goodsList = goodsMapper.selectList(new LambdaQueryWrapper().eq(OGoods::getGoodsNum,bo.getNumber())); + if(goodsList!=null && goodsList.size()>0) return ResultVo.error(-1,"商品编码已存在");// return -1; + + OGoods goods = new OGoods(); + goods.setGoodsNum(bo.getNumber()); + goods.setName(bo.getName()); + goods.setImage(bo.getImage()); + goods.setOuterErpGoodsId(bo.getOuterErpGoodsId()); + goods.setUnitName(bo.getUnitName()); + goods.setCategoryId(bo.getCategoryId()); + goods.setBarCode(bo.getBarCode()); + goods.setStatus(1); + goods.setLength(0.0); + goods.setHeight(0.0); + goods.setWidth(0.0); + goods.setWidth1(0.0); + goods.setWidth2(0.0); + goods.setWidth3(0.0); + goods.setWeight(0.0); + goods.setDisable(0); + goods.setPeriod(bo.getPeriod()); + goods.setPurPrice(bo.getPurPrice()); + goods.setWholePrice(bo.getWholePrice()); + goods.setRetailPrice(bo.getRetailPrice()); + goods.setUnitCost(bo.getUnitCost()); + goods.setSupplierId(bo.getSupplierId()); + goods.setBrandId(bo.getBrandId()); + goods.setLinkUrl(bo.getLinkUrl()); + goods.setLowQty(0); + goods.setHighQty(0); + goods.setCreateBy(userName); + goods.setCreateTime(new Date()); + goods.setProvince(bo.getProvince()); + goods.setCity(bo.getCity()); + goods.setTown(bo.getTown()); + + // 1、添加主表o_goods + goodsMapper.insert(goods); + + // 2、添加规格表erp_goods_spec + for (GoodsAddSkuBo skuBo:bo.getSpecList()) { + OGoodsSku spec = new OGoodsSku(); + spec.setGoodsId(goods.getId()); + spec.setOuterErpGoodsId(bo.getOuterErpGoodsId()); + spec.setOuterErpSkuId(skuBo.getOuterErpSkuId()); + spec.setGoodsName(bo.getName()); + String skuName =""; + if(StringUtils.hasText(skuBo.getColorValue())) + skuName+= skuBo.getColorValue(); + if(StringUtils.hasText(skuBo.getSizeValue())) + skuName+= " "+ skuBo.getSizeValue(); + if(StringUtils.hasText(skuBo.getStyleValue())) + skuName+= " "+ skuBo.getStyleValue(); + + spec.setSkuName(skuName); + spec.setSkuCode(skuBo.getSpecNum()); + spec.setColorId(skuBo.getColorId()); + spec.setColorValue(skuBo.getColorValue()); + if(bo.getColorImages()!=null && StringUtils.hasText(bo.getColorImages().get(skuBo.getColorId()))){ + spec.setColorImage(bo.getColorImages().get(skuBo.getColorId())); + }else { + spec.setColorImage(goods.getImage()); + } + spec.setSizeId(skuBo.getSizeId()); + spec.setSizeValue(skuBo.getSizeValue()); + spec.setStyleId(skuBo.getStyleId()); + spec.setStyleValue(skuBo.getStyleValue()); + if(bo.getPurPrice() == null){ + spec.setPurPrice(goods.getPurPrice()); + }else spec.setPurPrice(bo.getPurPrice()); + spec.setStatus(1); + + skuMapper.insert(spec); + + // 添加商品库存表 + OGoodsInventory inventory = new OGoodsInventory(); + inventory.setSkuId(spec.getId()); + inventory.setGoodsId(goods.getId()); + inventory.setGoodsNum(bo.getNumber()); + inventory.setSkuCode(skuBo.getSpecNum()); + inventory.setQuantity(0L); + inventory.setIsDelete(0); + inventory.setCreateTime(new Date()); + inventory.setCreateBy("添加商品"); + inventoryMapper.insert(inventory); + } + + // 3、添加规格属性表erp_goods_spec_attr + if(bo.getColorValues()!=null) { + for (Long val:bo.getColorValues()) { + OGoodsSkuAttr specAttr = new OGoodsSkuAttr(); + specAttr.setGoodsId(goods.getId()); + specAttr.setType("color"); + specAttr.setK("颜色"); + specAttr.setKid(114L); + specAttr.setVid(val); + skuAttrMapper.insert(specAttr); + } + + } + if(bo.getSizeValues()!=null) { + for (Long val:bo.getSizeValues()) { + OGoodsSkuAttr specAttr = new OGoodsSkuAttr(); + specAttr.setGoodsId(goods.getId()); + specAttr.setType("size"); + specAttr.setK("尺码"); + specAttr.setKid(115L); + specAttr.setVid(val); + skuAttrMapper.insert(specAttr); + } + + } + if(bo.getColorValues()!=null) { + for (Long val:bo.getColorValues()) { + OGoodsSkuAttr specAttr = new OGoodsSkuAttr(); + specAttr.setGoodsId(goods.getId()); + specAttr.setType("style"); + specAttr.setK("款式"); + specAttr.setKid(116L); + specAttr.setVid(val); + skuAttrMapper.insert(specAttr); + } + + } +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return ResultVo.success(Long.parseLong(goods.getId())); + } + + @Override + public int updateGoods(OGoods goods) { + return goodsMapper.updateById(goods); + } + + @Transactional + @Override + public int deleteGoodsByIds(Long[] ids) { + // 有业务关联的商品 +// for (Long id:ids){ +// List oOrderItems = orderItemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getGoodsId, id)); +// if(oOrderItems.isEmpty()){ +// // 删除库存 +// inventoryMapper.delete(new LambdaQueryWrapper().eq(OGoodsInventory::getGoodsId,id)); +// // 删除skuAttr +// skuAttrMapper.delete(new LambdaQueryWrapper().eq(OGoodsSkuAttr::getGoodsId,id)); +// // 删除sku +// skuMapper.delete(new LambdaQueryWrapper().eq(OGoodsSku::getGoodsId,id)); +// // 删除商品 +// goodsMapper.deleteById(id); +// }else{ +// return -100;//有关联的订单，不能删除 +// } +// } + return 0; + } + + @Override + public int insertGoodsSku(OGoodsSku goodsSku) { + // 是否存在 + List oGoodsSkus = skuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getOuterErpSkuId, goodsSku.getOuterErpSkuId()).or().eq(OGoodsSku::getSkuCode, goodsSku.getSkuCode())); + if(oGoodsSkus==null || oGoodsSkus.size() ==0) { + // 查询goodsId外键 + if (StringUtils.hasText(goodsSku.getOuterErpGoodsId())) { + List oGoods = goodsMapper.selectList(new LambdaQueryWrapper().eq(OGoods::getOuterErpGoodsId, goodsSku.getOuterErpGoodsId())); + if (oGoods != null && oGoods.size() > 0) { + goodsSku.setGoodsId(oGoods.get(0).getId()); + } else { + goodsSku.setGoodsId("0"); + } + } else { + goodsSku.setGoodsId("0"); + } + return skuMapper.insert(goodsSku); + } + return -1; + } + +// @Override +// public int saveGoodsSku(GoodsSkuAddBo addBo) { +// // 是否存在 +// List oGoodsSkus = skuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getOuterErpSkuId, addBo.getErpSkuId())); +// if(oGoodsSkus==null || oGoodsSkus.size() ==0) { +// //不存在，新增 +// OGoodsSku insert = new OGoodsSku(); +// insert.setGoodsId(addBo.getGoodsk); +// insert.setOuterErpGoodsId("0"); +// insert.setOuterErpSkuId(addBo.getErpSkuId()); +// insert.setSkuName(addBo.getProductSpec()); +// insert.setSkuCode(addBo.getErpSkuCode()); +// insert.setGoodsName(addBo.getErpSkuName()); +// insert.setRetailPrice(addBo.getSalePrice()); +// insert.setColorValue(addBo.getProductColor()); +// insert.setColorImage(addBo.getProductPicture1()); +// insert.setSizeValue(addBo.getMaterialKind()); +// insert.setVolume(addBo.getProductVolume()); +// insert.setStatus(addBo.getProductIsUse()); +// skuMapper.insert(insert); +// }else{ +// // 存在，修改 +// OGoodsSku update = new OGoodsSku(); +// update.setId(oGoodsSkus.get(0).getId()); +// update.setOuterErpSkuId(addBo.getErpSkuId()); +// update.setSkuName(addBo.getProductSpec()); +// update.setSkuCode(addBo.getErpSkuCode()); +// update.setGoodsName(addBo.getErpSkuName()); +// update.setRetailPrice(addBo.getSalePrice()); +// update.setColorValue(addBo.getProductColor()); +// update.setColorImage(addBo.getProductPicture1()); +// update.setSizeValue(addBo.getMaterialKind()); +// update.setVolume(addBo.getProductVolume()); +// update.setStatus(addBo.getProductIsUse()); +// skuMapper.updateById(update); +// } +// return 1; +// } +// +// @Override +// public int batchSaveGoodsSku(List list) { +// for (var bo:list) { +// if(StringUtils.hasText(bo.getErpSkuId()) && StringUtils.hasText(bo.getErpSkuCode()) ){ +// this.saveGoodsSku(bo); +// } +// } +// return 1; +// } +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java new file mode 100644 index 00000000..b49385c5 --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import cn.qihangerp.module.goods.service.OGoodsSkuAttrService; +import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_goods_sku_attr】的数据库操作Service实现 +* @createDate 2024-09-07 20:31:18 +*/ +@Service +public class OGoodsSkuAttrServiceImpl extends ServiceImpl + implements OGoodsSkuAttrService{ + +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java new file mode 100644 index 00000000..1999241e --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java @@ -0,0 +1,41 @@ +package cn.qihangerp.module.goods.service.impl; + + +import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.module.goods.service.OGoodsSkuService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @author TW +* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service实现 +* @createDate 2024-03-11 14:24:49 +*/ +@AllArgsConstructor +@Service +public class OGoodsSkuServiceImpl extends ServiceImpl + implements OGoodsSkuService { + private final OGoodsSkuMapper skuMapper; + @Override + public List searchGoodsSpec(String keyword) { + LambdaQueryWrapper queryWrapper = + new LambdaQueryWrapper() + .likeRight(OGoodsSku::getGoodsId,keyword).or() + .likeRight(OGoodsSku::getId,keyword).or() + .likeRight(OGoodsSku::getSkuCode,keyword).or() + .like(OGoodsSku::getGoodsName,keyword).or() + .like(OGoodsSku::getSkuName,keyword) + ; + queryWrapper.last("LIMIT 10"); + return skuMapper.selectList(queryWrapper); + } +} + + + + diff --git a/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java new file mode 100644 index 00000000..eb3d018a --- /dev/null +++ b/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java @@ -0,0 +1,39 @@ +package cn.qihangerp.module.goods.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.module.goods.service.OGoodsSupplierService; +import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【o_goods_supplier】的数据库操作Service实现 +* @createDate 2024-09-07 16:35:43 +*/ +@AllArgsConstructor +@Service +public class OGoodsSupplierServiceImpl extends ServiceImpl + implements OGoodsSupplierService{ + private final OGoodsSupplierMapper mapper; + + @Override + public PageResult queryPageList(OGoodsSupplier bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + + queryWrapper.like(StringUtils.hasText(bo.getName()), OGoodsSupplier::getName, bo.getName()); + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } +} + + + + diff --git a/goods/src/main/resources/mapper/OGoodsBrandMapper.xml b/goods/src/main/resources/mapper/OGoodsBrandMapper.xml new file mode 100644 index 00000000..48c4641e --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsBrandMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + id,name,status, + create_by,create_time,update_by, + update_time + + diff --git a/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml b/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml new file mode 100644 index 00000000..d61dee39 --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + id,category_id,type, + title,code + + diff --git a/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml b/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml new file mode 100644 index 00000000..91ec933f --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + id,category_attribute_id,value, + sku_code,orderNum,isDelete + + diff --git a/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml b/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml new file mode 100644 index 00000000..38146d7a --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + id,`number`,`name`, + remark,parent_id,path, + sort,image,isDelete, + create_by,create_time,update_by, + update_time + + diff --git a/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml b/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml new file mode 100644 index 00000000..03d40eeb --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,batch_num,origin_qty, + current_qty,pur_price,pur_id, + pur_item_id,remark,sku_id, + goods_id,sku_code,warehouse_id, + position_id,create_time,create_by, + update_time,update_by + + diff --git a/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml b/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml new file mode 100644 index 00000000..cbe46bf0 --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + id,goods_id,goods_num, + sku_id,sku_code,quantity, + is_delete,create_time,create_by, + update_time,update_by + + + diff --git a/goods/src/main/resources/mapper/OGoodsMapper.xml b/goods/src/main/resources/mapper/OGoodsMapper.xml new file mode 100644 index 00000000..cce1191e --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,name,image,province,city,town, + outer_erp_goods_id,goods_num,unit_name, + category_id,bar_code,remark, + status,length,height, + width,width1,width2, + width3,weight,disable, + period,pur_price,whole_price, + retail_price,unit_cost,supplier_id, + brand_id,attr1,attr2, + attr3,attr4,attr5, + link_url,low_qty,high_qty, + create_by,create_time,update_by, + update_time + + + + diff --git a/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml b/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml new file mode 100644 index 00000000..e334049a --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,goods_id,type, + k,kid,vid, + v,img + + diff --git a/goods/src/main/resources/mapper/OGoodsSkuMapper.xml b/goods/src/main/resources/mapper/OGoodsSkuMapper.xml new file mode 100644 index 00000000..957f526f --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsSkuMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,goods_id,outer_erp_goods_id,outer_erp_sku_id,goods_name, + sku_name,sku_code,color_id, + color_value,color_image,size_id, + size_value,style_id,style_value, + bar_code,pur_price, + retail_price,unit_cost,remark, + status,low_qty,high_qty, + volume + + diff --git a/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml b/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml new file mode 100644 index 00000000..e915afab --- /dev/null +++ b/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,name,number, + taxRate,amount,periodMoney, + difMoney,beginDate,remark, + place,linkMan,contact, + province,city,county, + address,pinYin,disable, + isDelete,purchaserName,createTime + + diff --git a/oms-api/pom.xml b/oms-api/pom.xml index d75cfa1f..0ca606d8 100644 --- a/oms-api/pom.xml +++ b/oms-api/pom.xml @@ -63,6 +63,11 @@ security 2.0.6 + + cn.qihangerp.module + goods + 2.0.6 + mysql mysql-connector-java diff --git a/oms-api/src/main/java/com/qihang/oms/OmsApi.java b/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java similarity index 71% rename from oms-api/src/main/java/com/qihang/oms/OmsApi.java rename to oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java index f2434132..f0953c73 100644 --- a/oms-api/src/main/java/com/qihang/oms/OmsApi.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java @@ -1,14 +1,16 @@ -package com.qihang.oms; +package cn.qihangerp.oms; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; //import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; //@EnableDiscoveryClient -@MapperScan("com.qihang.oms.mapper") -@ComponentScan(basePackages={"com.qihang"}) +//@MapperScan("cn.qihangerp.oms.mapper") +@EnableDiscoveryClient +@ComponentScan(basePackages={"cn.qihangerp"}) @SpringBootApplication public class OmsApi { public static void main( String[] args ) diff --git a/sys-api/src/main/java/com/qihang/sys/api/config/MybatisPlusConfig.java b/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java similarity index 87% rename from sys-api/src/main/java/com/qihang/sys/api/config/MybatisPlusConfig.java rename to oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java index 46e7efae..bf6a553c 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/config/MybatisPlusConfig.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.config; +package cn.qihangerp.oms.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -@MapperScan("com.qihang.sys.api.mapper") +@MapperScan({"cn.qihangerp.oms.mapper","cn.qihangerp.module.*.mapper"}) public class MybatisPlusConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { diff --git a/oms-api/src/main/java/com/qihang/oms/controller/AfterSaleController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleController.java similarity index 66% rename from oms-api/src/main/java/com/qihang/oms/controller/AfterSaleController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleController.java index 197bed7e..3c38d7ff 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/AfterSaleController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleController.java @@ -1,11 +1,10 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.ErpSaleAfterInfo; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.service.ErpSaleAfterInfoService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.oms.service.ErpSaleAfterInfoService; +import cn.qihangerp.oms.domain.ErpSaleAfterInfo; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsBrandController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsBrandController.java new file mode 100644 index 00000000..d93a963c --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsBrandController.java @@ -0,0 +1,70 @@ +package cn.qihangerp.oms.controller; + + + +import cn.qihangerp.common.PageQuery; + +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.module.goods.service.OGoodsBrandService; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; + +@AllArgsConstructor +@RestController +@RequestMapping("/goods_brand") +public class GoodsBrandController extends BaseController { + private final OGoodsBrandService brandService; + @GetMapping("/list") + public TableDataInfo skuList(OGoodsBrand bo, PageQuery pageQuery) + { + var pageList = brandService.queryPageList(bo,pageQuery); + return getDataTable(pageList); + } + + /** + * 获取商品品牌详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(brandService.getById(id)); + } + + /** + * 新增商品品牌 + */ + @PostMapping + public AjaxResult add(@RequestBody OGoodsBrand erpGoodsBrand) + { + erpGoodsBrand.setStatus(1); + erpGoodsBrand.setCreateBy(getUsername()); + erpGoodsBrand.setCreateTime(new Date()); + return toAjax(brandService.save(erpGoodsBrand)); + } + + /** + * 修改商品品牌 + */ + @PutMapping + public AjaxResult edit(@RequestBody OGoodsBrand erpGoodsBrand) + { + erpGoodsBrand.setUpdateBy(getUsername()); + erpGoodsBrand.setUpdateTime(new Date()); + return toAjax(brandService.updateById(erpGoodsBrand)); + } + + /** + * 删除商品品牌 + */ + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(brandService.removeByIds(Arrays.stream(ids).toList())); + } +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsCategoryController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsCategoryController.java new file mode 100644 index 00000000..184249f5 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsCategoryController.java @@ -0,0 +1,141 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.module.goods.domain.OGoodsCategory; +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; +import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; +import cn.qihangerp.module.goods.service.OGoodsCategoryService; +import cn.qihangerp.security.common.BaseController; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; + +@AllArgsConstructor +@RestController +@RequestMapping("/goods_category") +public class GoodsCategoryController extends BaseController { + private final OGoodsCategoryService categoryService; + private final OGoodsCategoryAttributeService categoryAttributeService; + private final OGoodsCategoryAttributeValueService categoryAttributeValueService; + + @GetMapping("/list") + public TableDataInfo categoryList() + { + var pageList = categoryService.list(); + return getDataTable(pageList); + } + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(categoryService.getById(id)); + } + + @PostMapping + public AjaxResult add(@RequestBody OGoodsCategory category) + { + category.setCreateBy(getUsername()); + categoryService.addCategory(category); + return toAjax(1); + } + + @PutMapping + public AjaxResult edit(@RequestBody OGoodsCategory category) + { + category.setUpdateBy(getUsername()); + category.setUpdateTime(new Date()); + return toAjax(categoryService.updateById(category)); + } + /** + * 删除分类 + * @param ids + * @return + */ + @DeleteMapping("/del/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(categoryService.removeByIds(Arrays.stream(ids).toList())); + } + + /** + * 分类属性列表 + * @param categoryId + * @return + */ + @GetMapping("/attribute_list") + public TableDataInfo attributeList(Integer categoryId) + { + var pageList = categoryAttributeService.list(new LambdaQueryWrapper().eq(OGoodsCategoryAttribute::getCategoryId,categoryId)); + return getDataTable(pageList); + } + + /** + * 分类属性添加 + * @param attribute + * @return + */ + @PostMapping("/attribute_add") + public AjaxResult attributeAdd(@RequestBody OGoodsCategoryAttribute attribute) + { + return toAjax(categoryAttributeService.save(attribute)); + } + + @GetMapping(value = "/attribute/{id}") + public AjaxResult getAttributeInfo(@PathVariable("id") Long id) + { + return success(categoryAttributeService.getById(id)); + } + + @PutMapping("/attribute") + public AjaxResult attributeEdit(@RequestBody OGoodsCategoryAttribute attribute) + { + return toAjax(categoryAttributeService.updateById(attribute)); + } + @DeleteMapping("/attribute/{ids}") + public AjaxResult attributeRemove(@PathVariable Long[] ids) + { + return toAjax(categoryAttributeService.removeByIds(Arrays.stream(ids).toList())); + } + + @GetMapping("/attribute_value_list") + public TableDataInfo attributeValueList(Integer categoryAttributeId) + { + var pageList = categoryAttributeValueService.list( + new LambdaQueryWrapper().eq(OGoodsCategoryAttributeValue::getCategoryAttributeId,categoryAttributeId)); + return getDataTable(pageList); + + } + + @PostMapping("/attribute_value") + public AjaxResult add(@RequestBody OGoodsCategoryAttributeValue attributeValue) + { + return toAjax(categoryAttributeValueService.save(attributeValue)); + } + @GetMapping(value = "/attribute_value/{id}") + public AjaxResult getAttributeValueInfo(@PathVariable("id") Long id) + { + return success(categoryAttributeValueService.getById(id)); + } + + @PutMapping("/attribute_value") + public AjaxResult attributeValueEdit(@RequestBody OGoodsCategoryAttributeValue attributeValue) + { + return toAjax(categoryAttributeValueService.updateById(attributeValue)); + } + + /** + * 删除商品分类属性值 + */ + @DeleteMapping("/attribute_value/{ids}") + public AjaxResult removeAttributeValue(@PathVariable Long[] ids) + { + return toAjax(categoryAttributeValueService.removeByIds(Arrays.stream(ids).toList())); + } +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsController.java new file mode 100644 index 00000000..6e92f48c --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsController.java @@ -0,0 +1,247 @@ +package cn.qihangerp.oms.controller; + + + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; + + +import cn.qihangerp.module.goods.domain.OGoods; +import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; +import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import cn.qihangerp.module.goods.service.OGoodsService; + + +import cn.qihangerp.module.goods.service.OGoodsSkuService; +import cn.qihangerp.security.common.BaseController; +import com.fasterxml.jackson.databind.exc.InvalidFormatException; +import lombok.AllArgsConstructor; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.NumberToTextConverter; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 商品管理Controller + * + * @author qihang + * @date 2023-12-29 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/goods") +public class GoodsController extends BaseController +{ + private final OGoodsService goodsService; + private final OGoodsSkuService skuService; + + /** + * 搜索商品SKU + * 条件：商品编码、SKU、商品名称 + */ + @GetMapping("/searchSku") + public TableDataInfo searchSkuBy(String keyword) + { + List list = goodsService.searchGoodsSpec(keyword); + return getDataTable(list); + } + + @GetMapping("/sku_list") + public TableDataInfo skuList(OGoodsSku bo, PageQuery pageQuery) + { + var pageList = goodsService.querySkuPageList(bo,pageQuery); + return getDataTable(pageList); + } + + /** + * 查询商品管理列表 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:list')") + @GetMapping("/list") + public TableDataInfo list(OGoods goods, PageQuery pageQuery) + { + PageResult pageList = goodsService.queryPageList(goods, pageQuery); + return getDataTable(pageList); + } + + /** + * 获取商品管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(goodsService.selectGoodsById(id)); + } + /** + * 获取商品管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:query')") + @GetMapping(value = "/sku/{id}") + public AjaxResult getSkuInfo(@PathVariable("id") Long id) + { + return success(skuService.getById(id)); + } + /** + * 新增商品管理 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:add')") + @PostMapping("/add") + public AjaxResult add(@RequestBody GoodsAddBo goods) + { + ResultVo resultVo = goodsService.insertGoods(getUsername(), goods); + if(resultVo.getCode()!=0) return AjaxResult.error(resultVo.getMsg()); + else return AjaxResult.success(resultVo.getData()); +// goods.setCreateBy(getUsername()); +// int result = goodsService.insertGoods(goods); +// if(result == -1) new AjaxResult(501,"商品编码已存在"); +// return toAjax(1); + } + + @PreAuthorize("@ss.hasPermi('goods:goods:add')") + @PostMapping("/goodsSku") + public AjaxResult addSku(@RequestBody OGoodsSku goodsSku) + { + + int result = goodsService.insertGoodsSku(goodsSku); + if(result == -1) new AjaxResult(501,"商品编码已存在"); + return toAjax(1); + } + + /** + * 修改商品管理 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:edit')") + @PutMapping + public AjaxResult edit(@RequestBody OGoods goods) + { + return toAjax(goodsService.updateGoods(goods)); + } + + /** + * 修改商品基本资料 + * @param sku + * @return + */ + @PutMapping("/sku") + public AjaxResult editSku(@RequestBody OGoodsSku sku) + { + return toAjax(skuService.updateById(sku)); + } + + /** + * 删除商品管理 + */ + @PreAuthorize("@ss.hasPermi('goods:goods:remove')") + @DeleteMapping("/del/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + int result = goodsService.deleteGoodsByIds(ids); + if(result==0) return AjaxResult.success(); + else if (result==-100) return AjaxResult.error("有关联的订单，不能删除！"); + else return AjaxResult.error(); + } + + @RequestMapping(value = "/goods_sku_import", method = RequestMethod.POST) + public AjaxResult orderSendExcel(@RequestPart("file") MultipartFile file) throws IOException, InvalidFormatException { + + String fileName = file.getOriginalFilename(); + String dir = System.getProperty("user.dir"); + String destFileName = dir + File.separator + "/import/uploadedfiles_" + fileName; + System.out.println(destFileName); + File destFile = new File(destFileName); + file.transferTo(destFile); + InputStream fis = null; + fis = new FileInputStream(destFileName); + if (fis == null) return AjaxResult.error("没有文件"); + + Workbook workbook = null; + + try { + if (fileName.toLowerCase().endsWith("xlsx")) { + workbook = new XSSFWorkbook(fis); + } else if (fileName.toLowerCase().endsWith("xls")) { + workbook = new HSSFWorkbook(fis); + } + // workbook = new HSSFWorkbook(fis); + } catch (Exception ex) { + return AjaxResult.error(ex.getMessage()); + } + + if (workbook == null) return AjaxResult.error(502, "未读取到Excel文件"); + + /****************开始处理excel****************/ + int success = 0; + int fail = 0; + Sheet sheet = null; + try { + sheet = workbook.getSheetAt(0); + int lastRowNum = sheet.getLastRowNum();//最后一行索引 + Row row = null; + + for (int i = 1; i <= lastRowNum; i++) { + row = sheet.getRow(i); + //数据 + OGoodsSku sku = new OGoodsSku(); + for(int c=0;c<6;c++){ + Cell cell = row.getCell(c); + String cellValue = ""; + if (cell != null) { + if (cell.getCellType() == CellType.STRING) { + cellValue = cell.getStringCellValue().replace("\t", ""); + } else if (cell.getCellType() == CellType.NUMERIC) { + cellValue = NumberToTextConverter.toText(cell.getNumericCellValue()).replace("\t", ""); + } + } + if(c == 1) { + if(StringUtils.hasText(cellValue) ){ + sku.setOuterErpGoodsId(cellValue); + }else { + sku.setOuterErpGoodsId("0"); + } + } + if(StringUtils.hasText(cellValue)) { + if (c == 0) { + sku.setOuterErpSkuId(cellValue); + } else if (c == 2) { + sku.setSkuCode(cellValue); + } else if (c == 3) { + sku.setSkuName(cellValue); + } else if (c == 4) { + sku.setColorImage(cellValue); + } else if (c == 5) { + sku.setRemark(cellValue); + } + } + } + goodsService.insertGoodsSku(sku); + success++; + } + + + } catch (Exception ex) { + fail++; + ex.printStackTrace(); + } + Map result = new HashMap<>(); + result.put("success",success); + result.put("fail",fail); + return AjaxResult.success(result); + } +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsInventoryController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsInventoryController.java new file mode 100644 index 00000000..38985ecf --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsInventoryController.java @@ -0,0 +1,47 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; + +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.module.goods.domain.OGoodsInventory; +import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; +import cn.qihangerp.module.goods.service.OGoodsInventoryService; +import cn.qihangerp.security.common.BaseController; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@AllArgsConstructor +@RestController +@RequestMapping("/goodsInventory") +public class GoodsInventoryController extends BaseController { + private final OGoodsInventoryService goodsInventoryService; + private final OGoodsInventoryBatchService inventoryBatchService; + + @GetMapping("/list") + public TableDataInfo list(OGoodsInventory bo, PageQuery pageQuery) + { + PageResult pageResult = goodsInventoryService.queryPageList(bo, pageQuery); + return getDataTable(pageResult); + } + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + OGoodsInventory goodsInventory = goodsInventoryService.getById(id); + if(goodsInventory!=null) { + List list = inventoryBatchService.list(new LambdaQueryWrapper().eq(OGoodsInventoryBatch::getSkuId, goodsInventory.getSkuId())); + return AjaxResult.success(list); + } + return success(); + } +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsSupplierController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsSupplierController.java new file mode 100644 index 00000000..96e04be6 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsSupplierController.java @@ -0,0 +1,67 @@ +package cn.qihangerp.oms.controller; + + +import cn.qihangerp.common.PageQuery; + +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.module.goods.service.OGoodsSupplierService; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; + +@AllArgsConstructor +@RestController +@RequestMapping("/supplier") +public class GoodsSupplierController extends BaseController { + private final OGoodsSupplierService supplierService; + + @GetMapping("/list") + public TableDataInfo list(OGoodsSupplier bo, PageQuery pageQuery) + { + var pageList = supplierService.queryPageList(bo,pageQuery); + return getDataTable(pageList); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(supplierService.getById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @PostMapping + public AjaxResult add(@RequestBody OGoodsSupplier scmSupplier) + { + scmSupplier.setCreatetime(new Date()); + scmSupplier.setIsdelete(0); + return toAjax(supplierService.save(scmSupplier)); + } + + /** + * 修改【请填写功能名称】 + */ + @PutMapping + public AjaxResult edit(@RequestBody OGoodsSupplier scmSupplier) + { + return toAjax(supplierService.updateById(scmSupplier)); + } + + /** + * 删除【请填写功能名称】 + */ + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(supplierService.removeByIds(Arrays.stream(ids).toList())); + } +} diff --git a/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java similarity index 92% rename from oms-api/src/main/java/com/qihang/oms/controller/HomeController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java index 4d78a16a..ccb8fd93 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java @@ -1,4 +1,4 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderController.java similarity index 79% rename from oms-api/src/main/java/com/qihang/oms/controller/OrderController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/OrderController.java index 044f348a..e98fb02e 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderController.java @@ -1,20 +1,16 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.mq.MqType; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.domain.ErpSaleOrderItem; -import com.qihang.oms.service.ErpSaleOrderService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.oms.service.ErpSaleOrderService; +import cn.qihangerp.oms.domain.ErpSaleOrder; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.List; /** * 店铺订单Controller diff --git a/oms-api/src/main/java/com/qihang/oms/controller/OrderItemController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderItemController.java similarity index 64% rename from oms-api/src/main/java/com/qihang/oms/controller/OrderItemController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/OrderItemController.java index 2e272af5..ec9ea606 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/OrderItemController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderItemController.java @@ -1,18 +1,12 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.ErpSaleOrderItem; -import com.qihang.oms.domain.bo.OrderItemListBo; -import com.qihang.oms.service.ErpSaleOrderItemService; -import com.qihang.oms.service.ErpSaleOrderService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.oms.service.ErpSaleOrderItemService; +import cn.qihangerp.oms.domain.bo.OrderItemListBo; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; /** diff --git a/oms-api/src/main/java/com/qihang/oms/controller/RefundController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java similarity index 60% rename from oms-api/src/main/java/com/qihang/oms/controller/RefundController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java index e0aba9b0..527ed6a5 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/RefundController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java @@ -1,19 +1,14 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.ErpSaleAfterRefund; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.service.ErpSaleAfterRefundService; -import com.qihang.oms.service.ErpSaleOrderService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.oms.domain.ErpSaleAfterRefund; +import cn.qihangerp.oms.service.ErpSaleAfterRefundService; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/oms-api/src/main/java/com/qihang/oms/controller/ShipController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShipController.java similarity index 57% rename from oms-api/src/main/java/com/qihang/oms/controller/ShipController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/ShipController.java index 3c82fc7f..6a8b72de 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/ShipController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShipController.java @@ -1,26 +1,15 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.domain.SShop; -import com.qihang.oms.domain.SShopPlatform; -import com.qihang.oms.domain.SysLogisticsCompany; -import com.qihang.oms.domain.bo.ShipStockUpBo; -import com.qihang.oms.domain.bo.ShipWaybillBo; -import com.qihang.oms.service.*; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.oms.domain.bo.ShipStockUpBo; +import cn.qihangerp.oms.domain.bo.ShipWaybillBo; +import cn.qihangerp.oms.service.ErpShipStockUpService; +import cn.qihangerp.oms.service.ErpShipWaybillService; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - /** * 店铺Controller * diff --git a/oms-api/src/main/java/com/qihang/oms/controller/ShopController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java similarity index 63% rename from oms-api/src/main/java/com/qihang/oms/controller/ShopController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index 12f92f65..06a57b77 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/ShopController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -1,17 +1,17 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; +import cn.qihangerp.oms.domain.OShop; +import cn.qihangerp.oms.domain.OShopPlatform; + +import cn.qihangerp.oms.domain.ShopBo; +import cn.qihangerp.oms.service.OShopPlatformService; +import cn.qihangerp.oms.service.OShopService; + +import cn.qihangerp.oms.service.SysLogisticsCompanyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.SShop; -import com.qihang.oms.domain.SShopPlatform; -import com.qihang.oms.domain.SysLogisticsCompany; -import com.qihang.oms.service.SShopPlatformService; -import com.qihang.oms.service.SShopService; -import com.qihang.oms.service.SysLogisticsCompanyService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -31,25 +31,25 @@ import java.util.List; @RequestMapping("/shop") public class ShopController extends BaseController { private final SysLogisticsCompanyService logisticsCompanyService; - private final SShopService shopService; - private final SShopPlatformService platformService; + private final OShopService shopService; + private final OShopPlatformService platformService; /** * 查询店铺列表logistics */ @PreAuthorize("@ss.hasPermi('shop:shop:list')") @GetMapping("/list") - public TableDataInfo list(SShop shop) + public TableDataInfo list(ShopBo shop) { - LambdaQueryWrapper qw = new LambdaQueryWrapper().eq(shop.getPlatform()!=null,SShop::getPlatform,shop.getPlatform()); - List list = shopService.list(qw); + LambdaQueryWrapper qw = new LambdaQueryWrapper().eq(shop.getPlatform()!=null,OShop::getType,shop.getPlatform()); + List list = shopService.list(qw); return getDataTable(list); } @GetMapping("/platformList") public TableDataInfo platformList() { - List list = platformService.list(); + List list = platformService.list(); return getDataTable(list); } @@ -74,9 +74,9 @@ public class ShopController extends BaseController { */ @PreAuthorize("@ss.hasPermi('shop:shop:add')") @PostMapping("/shop") - public AjaxResult add(@RequestBody SShop shop) + public AjaxResult add(@RequestBody OShop shop) { - shop.setCreateTime(new Date()); +// shop.setCreateTime(new Date()); return toAjax(shopService.save(shop)); } @@ -85,9 +85,9 @@ public class ShopController extends BaseController { */ @PreAuthorize("@ss.hasPermi('shop:shop:edit')") @PutMapping("/shop") - public AjaxResult edit(@RequestBody SShop shop) + public AjaxResult edit(@RequestBody OShop shop) { - shop.setUpdateTime(new Date()); +// shop.setUpdateTime(new Date()); return toAjax(shopService.updateById(shop)); } @@ -97,7 +97,7 @@ public class ShopController extends BaseController { * @return */ @PutMapping("/platform") - public AjaxResult edit(@RequestBody SShopPlatform platform) + public AjaxResult edit(@RequestBody OShopPlatform platform) { return toAjax(platformService.updateById(platform)); } diff --git a/oms-api/src/main/java/com/qihang/oms/controller/ShopPullLogsController.java b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java similarity index 55% rename from oms-api/src/main/java/com/qihang/oms/controller/ShopPullLogsController.java rename to oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java index 9c7fd643..41f2bea3 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/ShopPullLogsController.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java @@ -1,10 +1,12 @@ -package com.qihang.oms.controller; +package cn.qihangerp.oms.controller; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.TableDataInfo; -import com.qihang.oms.domain.SysShopPullLogs; -import com.qihang.oms.service.SysShopPullLogsService; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.common.TableDataInfo; + +import cn.qihangerp.oms.domain.OShopPullLogs; + +import cn.qihangerp.oms.service.OShopPullLogsService; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,10 +16,10 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/shop") public class ShopPullLogsController extends BaseController { - private final SysShopPullLogsService pullLogsService; + private final OShopPullLogsService pullLogsService; @GetMapping("/pull_logs_list") - public TableDataInfo list(SysShopPullLogs logs, PageQuery pageQuery) + public TableDataInfo list(OShopPullLogs logs, PageQuery pageQuery) { var pageList = pullLogsService.queryPageList(logs,pageQuery); return getDataTable(pageList); diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterInfo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterInfo.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterInfo.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterInfo.java index f3c810f9..0fc4b456 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterInfo.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterInfo.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterRefund.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterRefund.java index 82ec0d4c..61971066 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleAfterRefund.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrder.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrder.java index fc5c21d3..be259d8f 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrderItem.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrderItem.java index 4468a1ff..6701c1b1 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpSaleOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpShipStockUp.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipStockUp.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpShipStockUp.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipStockUp.java index ad770186..27e06e49 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpShipStockUp.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipStockUp.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpShipWaybill.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipWaybill.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/ErpShipWaybill.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipWaybill.java index 8ba541fa..d55662b5 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/ErpShipWaybill.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ErpShipWaybill.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/SShop.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShop.java similarity index 57% rename from oms-api/src/main/java/com/qihang/oms/domain/SShop.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OShop.java index 7c5d6d24..1ad056c2 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/SShop.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShop.java @@ -1,63 +1,53 @@ -package com.qihang.oms.domain; - -import java.io.Serializable; -import java.util.Date; +package cn.qihangerp.oms.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.io.Serializable; + /** - * 电商平台店铺表 - * @TableName s_shop + * 数据中心-店铺 + * @TableName sys_shop */ @Data -public class SShop implements Serializable { +public class OShop implements Serializable { /** * 主键 */ @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 店铺名 */ private String name; - /** - * 店铺别名 - */ - private String nickName; - - /** - * 标识 - */ - private String ename; - - /** - * 店铺主题 - */ - private String company; - /** * 对应第三方平台Id */ - private Integer platform; + private Integer type; /** * 店铺url */ - private String shopUrl; + private String url; /** * 排序 */ - private Integer orderNum; + private Integer sort; /** - * 是否删除0否1是 + * 状态（1正常2已删除） */ - private Integer isDelete; + private Integer status; + + /** + * 更新时间 + */ + private Long modifyOn; /** * 描述 @@ -65,17 +55,17 @@ public class SShop implements Serializable { private String remark; /** - * 第三方平台店铺id + * 第三方平台店铺id，淘宝天猫开放平台使用 */ - private Long sellerShopId; + private Long sellerId; /** - * Appkey(微信视频号小店专用) + * Appkey */ private String appKey; /** - * Appsercet(微信视频号小店专用) + * Appsercet */ private String appSercet; @@ -85,9 +75,9 @@ public class SShop implements Serializable { private String accessToken; /** - * accessToken到期（秒） + * 到期 */ - private Long accessExpiresIn; + private Long expiresIn; /** * access_token开始时间 @@ -105,14 +95,15 @@ public class SShop implements Serializable { private Long refreshTokenTimeout; /** - * 创建时间 + * 请求url */ - private Date createTime; + private String apiRequestUrl; - /** - * 更新时间 - */ - private Date updateTime; + + @TableField(exist = false) + private Integer verifyUser; private static final long serialVersionUID = 1L; + + } \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/SShopPlatform.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPlatform.java similarity index 51% rename from oms-api/src/main/java/com/qihang/oms/domain/SShopPlatform.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPlatform.java index 9141be62..ba232b18 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/SShopPlatform.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPlatform.java @@ -1,22 +1,21 @@ -package com.qihang.oms.domain; - -import java.io.Serializable; -import java.util.Date; +package cn.qihangerp.oms.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.io.Serializable; + /** - * 电商平台配置表 - * @TableName s_shop_platform + * 店铺平台配置表 + * @TableName o_shop_platform */ @Data -public class SShopPlatform implements Serializable { +public class OShopPlatform implements Serializable { /** - * 主键 + * */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(type = IdType.AUTO) private Integer id; /** @@ -25,39 +24,36 @@ public class SShopPlatform implements Serializable { private String name; /** - * appKey + * 平台编码 + */ + private String code; + + /** + * */ private String appKey; /** - * appSecret + * */ private String appSecret; /** - * 描述 + * 平台回调uri */ - private String remark; + private String redirectUri; /** - * 服务url + * 接口访问地址 */ private String serverUrl; + private Integer sort; + private Long regionId; /** - * 回调url + * 状态（0启用1关闭） */ - private String redirectUrl; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; + private String status; private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLasttime.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLasttime.java new file mode 100644 index 00000000..c99c00b6 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLasttime.java @@ -0,0 +1,60 @@ +package cn.qihangerp.oms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 店铺更新最后时间记录 + * @TableName sys_shop_pull_lasttime + */ +@Data +public class OShopPullLasttime implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private String id; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 类型（ORDER:订单，REFUND:退款） + */ + private Object pullType; + + /** + * 最后更新时间 + */ + private LocalDateTime lasttime; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + private static final long serialVersionUID = 1L; + public OShopPullLasttime(){ + + } + + public OShopPullLasttime(Long shopId, Object pullType, LocalDateTime lasttime, Date createTime, Date updateTime) { + this.shopId = shopId; + this.pullType = pullType; + this.lasttime = lasttime; + this.createTime = createTime; + this.updateTime = updateTime; + } +} \ No newline at end of file diff --git a/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLogs.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLogs.java new file mode 100644 index 00000000..7b03dcba --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLogs.java @@ -0,0 +1,75 @@ +package cn.qihangerp.oms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 店铺更新日志表 + * @TableName sys_shop_pull_logs + */ +@Data +public class OShopPullLogs implements Serializable { + /** + * 主键Id + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 平台id + */ + private Integer shopType; + + /** + * 类型（ORDER订单，GOODS商品，REFUND退款） + */ + private String pullType; + + /** + * 拉取方式（主动拉取、定时任务） + */ + private String pullWay; + + /** + * 拉取参数 + */ + private String pullParams; + + /** + * 拉取结果 + */ + private String pullResult; + + /** + * 拉取时间 + */ + private Date pullTime; + + /** + * 耗时（毫秒） + */ + private Long duration; + + public OShopPullLogs(Long shopId, Integer shopType, String pullType, String pullWay, String pullParams, String pullResult, Date pullTime, Long duration) { + this.shopId = shopId; + this.shopType = shopType; + this.pullType = pullType; + this.pullWay = pullWay; + this.pullParams = pullParams; + this.pullResult = pullResult; + this.pullTime = pullTime; + this.duration = duration; + } + + public OShopPullLogs(){} + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouGoodsSku.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouGoodsSku.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsDouGoodsSku.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouGoodsSku.java index 907234c0..75e8ceb1 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouGoodsSku.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouGoodsSku.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrder.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrder.java index ae3f65b0..42457c31 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrderItem.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrderItem.java index d7edc205..0ac909bf 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouRefund.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouRefund.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsDouRefund.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouRefund.java index 7c39a116..e1ac6583 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsDouRefund.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsDouRefund.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdAfterSale.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdAfterSale.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsJdAfterSale.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdAfterSale.java index defd0848..deae4086 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdAfterSale.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdAfterSale.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdGoodsSku.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdGoodsSku.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsJdGoodsSku.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdGoodsSku.java index 27b0530d..63af9b69 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdGoodsSku.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdGoodsSku.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrder.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrder.java index 6093886f..97946891 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrderItem.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrderItem.java index 11dd2c03..d22f77d5 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsJdOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddGoodsSku.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddGoodsSku.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsPddGoodsSku.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddGoodsSku.java index af238fc0..3f58691e 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddGoodsSku.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddGoodsSku.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrder.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrder.java index 15ea9c68..e819ab0f 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrderItem.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrderItem.java index 1106be77..b278ff84 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddRefund.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddRefund.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsPddRefund.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddRefund.java index 2a2c3a5f..00dd756a 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsPddRefund.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsPddRefund.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoGoodsSku.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoGoodsSku.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsTaoGoodsSku.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoGoodsSku.java index eedf1546..b4befa2f 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoGoodsSku.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoGoodsSku.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrder.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrder.java index 5843ce5b..51cc59f9 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrderItem.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrderItem.java index 1dfce29c..11247ec2 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoRefund.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoRefund.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsTaoRefund.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoRefund.java index 04f41576..7472db54 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsTaoRefund.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsTaoRefund.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiGoodsSku.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiGoodsSku.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsWeiGoodsSku.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiGoodsSku.java index 0130daf4..076f6beb 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiGoodsSku.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiGoodsSku.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrder.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrder.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrder.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrder.java index 6d3236a6..f93a2b7f 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrder.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrder.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrderItem.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrderItem.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrderItem.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrderItem.java index 18cd41e4..60709cda 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiOrderItem.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiOrderItem.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiRefund.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiRefund.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/domain/OmsWeiRefund.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiRefund.java index b27202f6..bc5b518c 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/OmsWeiRefund.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/OmsWeiRefund.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; import java.util.Date; diff --git a/oms-api/src/main/java/cn/qihangerp/oms/domain/SShop.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/SShop.java new file mode 100644 index 00000000..9bd6d666 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/SShop.java @@ -0,0 +1,118 @@ +//package cn.qihangerp.oms.domain; +// +//import java.io.Serializable; +//import java.util.Date; +// +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import lombok.Data; +// +///** +// * 电商平台店铺表 +// * @TableName s_shop +// */ +//@Data +//public class SShop implements Serializable { +// /** +// * 主键 +// */ +// @TableId(value = "id", type = IdType.AUTO) +// private Integer id; +// +// /** +// * 店铺名 +// */ +// private String name; +// +// /** +// * 店铺别名 +// */ +// private String nickName; +// +// /** +// * 标识 +// */ +// private String ename; +// +// /** +// * 店铺主题 +// */ +// private String company; +// +// /** +// * 对应第三方平台Id +// */ +// private Integer platform; +// +// /** +// * 店铺url +// */ +// private String shopUrl; +// +// /** +// * 排序 +// */ +// private Integer orderNum; +// +// /** +// * 是否删除0否1是 +// */ +// private Integer isDelete; +// +// /** +// * 描述 +// */ +// private String remark; +// +// /** +// * 第三方平台店铺id +// */ +// private Long sellerShopId; +// +// /** +// * Appkey(微信视频号小店专用) +// */ +// private String appKey; +// +// /** +// * Appsercet(微信视频号小店专用) +// */ +// private String appSercet; +// +// /** +// * 第三方平台sessionKey（access_token） +// */ +// private String accessToken; +// +// /** +// * accessToken到期（秒） +// */ +// private Long accessExpiresIn; +// +// /** +// * access_token开始时间 +// */ +// private Long accessTokenBegin; +// +// /** +// * 刷新token +// */ +// private String refreshToken; +// +// /** +// * 刷新token过期时间 +// */ +// private Long refreshTokenTimeout; +// +// /** +// * 创建时间 +// */ +// private Date createTime; +// +// /** +// * 更新时间 +// */ +// private Date updateTime; +// +// private static final long serialVersionUID = 1L; +//} \ No newline at end of file diff --git a/oms-api/src/main/java/cn/qihangerp/oms/domain/ShopBo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/ShopBo.java new file mode 100644 index 00000000..b2158234 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/ShopBo.java @@ -0,0 +1,40 @@ +package cn.qihangerp.oms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + * 数据中心-店铺 + * @TableName sys_shop + */ +@Data +public class ShopBo implements Serializable { + + + /** + * 店铺名 + */ + private String name; + + /** + * 对应第三方平台Id + */ + private Integer platform; + + + + /** + * 状态（1正常2已删除） + */ + private Integer status; + + + + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/SysLogisticsCompany.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/domain/SysLogisticsCompany.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java index 29814469..a37d5165 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/SysLogisticsCompany.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain; +package cn.qihangerp.oms.domain; import java.io.Serializable; diff --git a/oms-api/src/main/java/cn/qihangerp/oms/domain/SysShopPullLogs.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/SysShopPullLogs.java new file mode 100644 index 00000000..40af8f0e --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/SysShopPullLogs.java @@ -0,0 +1,245 @@ +//package cn.qihangerp.oms.domain; +// +//import com.baomidou.mybatisplus.annotation.TableName; +// +//import java.io.Serializable; +//import java.util.Date; +// +///** +// * 更新日志表 +// * @TableName sys_shop_pull_logs +// */ +//@TableName("s_shop_pull_logs") +//public class SysShopPullLogs implements Serializable { +// /** +// * 主键Id +// */ +// private Long id; +// +// /** +// * 店铺id +// */ +// private Integer shopId; +// +// /** +// * 平台id +// */ +// private Integer shopType; +// +// /** +// * 类型（ORDER订单，GOODS商品，REFUND退款） +// */ +// private String pullType; +// +// /** +// * 拉取方式（主动拉取、定时任务） +// */ +// private String pullWay; +// +// /** +// * 拉取参数 +// */ +// private String pullParams; +// +// /** +// * 拉取结果 +// */ +// private String pullResult; +// +// /** +// * 拉取时间 +// */ +// private Date pullTime; +// +// /** +// * 耗时（毫秒） +// */ +// private Long duration; +// +// private static final long serialVersionUID = 1L; +// +// /** +// * 主键Id +// */ +// public Long getId() { +// return id; +// } +// +// /** +// * 主键Id +// */ +// public void setId(Long id) { +// this.id = id; +// } +// +// /** +// * 店铺id +// */ +// public Integer getShopId() { +// return shopId; +// } +// +// /** +// * 店铺id +// */ +// public void setShopId(Integer shopId) { +// this.shopId = shopId; +// } +// +// /** +// * 平台id +// */ +// public Integer getShopType() { +// return shopType; +// } +// +// /** +// * 平台id +// */ +// public void setShopType(Integer shopType) { +// this.shopType = shopType; +// } +// +// /** +// * 类型（ORDER订单，GOODS商品，REFUND退款） +// */ +// public String getPullType() { +// return pullType; +// } +// +// /** +// * 类型（ORDER订单，GOODS商品，REFUND退款） +// */ +// public void setPullType(String pullType) { +// this.pullType = pullType; +// } +// +// /** +// * 拉取方式（主动拉取、定时任务） +// */ +// public String getPullWay() { +// return pullWay; +// } +// +// /** +// * 拉取方式（主动拉取、定时任务） +// */ +// public void setPullWay(String pullWay) { +// this.pullWay = pullWay; +// } +// +// /** +// * 拉取参数 +// */ +// public String getPullParams() { +// return pullParams; +// } +// +// /** +// * 拉取参数 +// */ +// public void setPullParams(String pullParams) { +// this.pullParams = pullParams; +// } +// +// /** +// * 拉取结果 +// */ +// public String getPullResult() { +// return pullResult; +// } +// +// /** +// * 拉取结果 +// */ +// public void setPullResult(String pullResult) { +// this.pullResult = pullResult; +// } +// +// /** +// * 拉取时间 +// */ +// public Date getPullTime() { +// return pullTime; +// } +// +// /** +// * 拉取时间 +// */ +// public void setPullTime(Date pullTime) { +// this.pullTime = pullTime; +// } +// +// /** +// * 耗时（毫秒） +// */ +// public Long getDuration() { +// return duration; +// } +// +// /** +// * 耗时（毫秒） +// */ +// public void setDuration(Long duration) { +// this.duration = duration; +// } +// +// @Override +// public boolean equals(Object that) { +// if (this == that) { +// return true; +// } +// if (that == null) { +// return false; +// } +// if (getClass() != that.getClass()) { +// return false; +// } +// SysShopPullLogs other = (SysShopPullLogs) that; +// return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) +// && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId())) +// && (this.getShopType() == null ? other.getShopType() == null : this.getShopType().equals(other.getShopType())) +// && (this.getPullType() == null ? other.getPullType() == null : this.getPullType().equals(other.getPullType())) +// && (this.getPullWay() == null ? other.getPullWay() == null : this.getPullWay().equals(other.getPullWay())) +// && (this.getPullParams() == null ? other.getPullParams() == null : this.getPullParams().equals(other.getPullParams())) +// && (this.getPullResult() == null ? other.getPullResult() == null : this.getPullResult().equals(other.getPullResult())) +// && (this.getPullTime() == null ? other.getPullTime() == null : this.getPullTime().equals(other.getPullTime())) +// && (this.getDuration() == null ? other.getDuration() == null : this.getDuration().equals(other.getDuration())); +// } +// +// @Override +// public int hashCode() { +// final int prime = 31; +// int result = 1; +// result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); +// result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode()); +// result = prime * result + ((getShopType() == null) ? 0 : getShopType().hashCode()); +// result = prime * result + ((getPullType() == null) ? 0 : getPullType().hashCode()); +// result = prime * result + ((getPullWay() == null) ? 0 : getPullWay().hashCode()); +// result = prime * result + ((getPullParams() == null) ? 0 : getPullParams().hashCode()); +// result = prime * result + ((getPullResult() == null) ? 0 : getPullResult().hashCode()); +// result = prime * result + ((getPullTime() == null) ? 0 : getPullTime().hashCode()); +// result = prime * result + ((getDuration() == null) ? 0 : getDuration().hashCode()); +// return result; +// } +// +// @Override +// public String toString() { +// StringBuilder sb = new StringBuilder(); +// sb.append(getClass().getSimpleName()); +// sb.append(" ["); +// sb.append("Hash = ").append(hashCode()); +// sb.append(", id=").append(id); +// sb.append(", shopId=").append(shopId); +// sb.append(", shopType=").append(shopType); +// sb.append(", pullType=").append(pullType); +// sb.append(", pullWay=").append(pullWay); +// sb.append(", pullParams=").append(pullParams); +// sb.append(", pullResult=").append(pullResult); +// sb.append(", pullTime=").append(pullTime); +// sb.append(", duration=").append(duration); +// sb.append(", serialVersionUID=").append(serialVersionUID); +// sb.append("]"); +// return sb.toString(); +// } +//} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/bo/OrderItemListBo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/OrderItemListBo.java similarity index 95% rename from oms-api/src/main/java/com/qihang/oms/domain/bo/OrderItemListBo.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/bo/OrderItemListBo.java index 7fcc9c0e..9c9ba3f4 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/bo/OrderItemListBo.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/OrderItemListBo.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain.bo; +package cn.qihangerp.oms.domain.bo; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/bo/ShipStockUpBo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipStockUpBo.java similarity index 79% rename from oms-api/src/main/java/com/qihang/oms/domain/bo/ShipStockUpBo.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipStockUpBo.java index 290307df..5d1f2755 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/bo/ShipStockUpBo.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipStockUpBo.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain.bo; +package cn.qihangerp.oms.domain.bo; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/bo/ShipWaybillBo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipWaybillBo.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/domain/bo/ShipWaybillBo.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipWaybillBo.java index 3957a9c1..d1286a6c 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/bo/ShipWaybillBo.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/bo/ShipWaybillBo.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain.bo; +package cn.qihangerp.oms.domain.bo; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/domain/vo/OrderItemListVo.java b/oms-api/src/main/java/cn/qihangerp/oms/domain/vo/OrderItemListVo.java similarity index 96% rename from oms-api/src/main/java/com/qihang/oms/domain/vo/OrderItemListVo.java rename to oms-api/src/main/java/cn/qihangerp/oms/domain/vo/OrderItemListVo.java index e889b19b..7f545b09 100644 --- a/oms-api/src/main/java/com/qihang/oms/domain/vo/OrderItemListVo.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/domain/vo/OrderItemListVo.java @@ -1,4 +1,4 @@ -package com.qihang.oms.domain.vo; +package cn.qihangerp.oms.domain.vo; import lombok.Data; diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterInfoMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterInfoMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterInfoMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterInfoMapper.java index 72508cf5..ea4e7239 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterInfoMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterInfoMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.ErpSaleAfterInfo; +import cn.qihangerp.oms.domain.ErpSaleAfterInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterRefundMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterRefundMapper.java index f706f59e..33a5db85 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleAfterRefundMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.ErpSaleAfterRefund; +import cn.qihangerp.oms.domain.ErpSaleAfterRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderItemMapper.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderItemMapper.java index 9e6830a7..25e383f7 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderItemMapper.java @@ -1,10 +1,10 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; +import cn.qihangerp.oms.domain.ErpSaleOrderItem; +import cn.qihangerp.oms.domain.bo.OrderItemListBo; +import cn.qihangerp.oms.domain.vo.OrderItemListVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.qihang.oms.domain.ErpSaleOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qihang.oms.domain.bo.OrderItemListBo; -import com.qihang.oms.domain.vo.OrderItemListVo; import io.lettuce.core.dynamic.annotation.Param; import java.util.List; diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderMapper.java index c2cf1b1c..fadf2e31 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpSaleOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.ErpSaleOrder; +import cn.qihangerp.oms.domain.ErpSaleOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpShipStockUpMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipStockUpMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpShipStockUpMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipStockUpMapper.java index e0678422..e809cd48 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpShipStockUpMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipStockUpMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.ErpShipStockUp; +import cn.qihangerp.oms.domain.ErpShipStockUp; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpShipWaybillMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipWaybillMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/ErpShipWaybillMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipWaybillMapper.java index bf93016c..2e07284f 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/ErpShipWaybillMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/ErpShipWaybillMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.ErpShipWaybill; +import cn.qihangerp.oms.domain.ErpShipWaybill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopMapper.java new file mode 100644 index 00000000..db8986a9 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopMapper.java @@ -0,0 +1,19 @@ +package cn.qihangerp.oms.mapper; + + +import cn.qihangerp.oms.domain.OShop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Mapper +* @createDate 2024-03-17 15:17:34 +* @Entity cn.qihangerp.oms.domain.SysShop +*/ +public interface OShopMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPlatformMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPlatformMapper.java new file mode 100644 index 00000000..53dbd9bf --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPlatformMapper.java @@ -0,0 +1,19 @@ +package cn.qihangerp.oms.mapper; + + +import cn.qihangerp.oms.domain.OShopPlatform; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_shop_platform(店铺平台配置表)】的数据库操作Mapper +* @createDate 2024-07-27 18:06:22 +* @Entity cn.qihangerp.domain.OShopPlatform +*/ +public interface OShopPlatformMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLasttimeMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLasttimeMapper.java new file mode 100644 index 00000000..34289639 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLasttimeMapper.java @@ -0,0 +1,19 @@ +package cn.qihangerp.oms.mapper; + + +import cn.qihangerp.oms.domain.OShopPullLasttime; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【sys_shop_pull_lasttime(店铺更新最后时间记录)】的数据库操作Mapper +* @createDate 2024-06-04 16:13:03 +* @Entity cn.qihangerp.domain.SysShopPullLasttime +*/ +public interface OShopPullLasttimeMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SysShopPullLogsMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLogsMapper.java similarity index 50% rename from oms-api/src/main/java/com/qihang/oms/mapper/SysShopPullLogsMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLogsMapper.java index 0b863b07..b47a3f7c 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SysShopPullLogsMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLogsMapper.java @@ -1,15 +1,16 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.SysShopPullLogs; + +import cn.qihangerp.oms.domain.OShopPullLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author TW * @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Mapper * @createDate 2024-03-22 17:43:38 -* @Entity com.qihang.oms.domain.SysShopPullLogs +* @Entity cn.qihangerp.oms.domain.SysShopPullLogs */ -public interface SysShopPullLogsMapper extends BaseMapper { +public interface OShopPullLogsMapper extends BaseMapper { } diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouGoodsSkuMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouGoodsSkuMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsDouGoodsSkuMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouGoodsSkuMapper.java index 88846f42..25c6771e 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouGoodsSkuMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouGoodsSkuMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsDouGoodsSku; +import cn.qihangerp.oms.domain.OmsDouGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderItemMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderItemMapper.java index 4d18c5f0..adb9ef8c 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderItemMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsDouOrderItem; +import cn.qihangerp.oms.domain.OmsDouOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderMapper.java index 3e831c8b..4dfc4ba3 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsDouOrder; +import cn.qihangerp.oms.domain.OmsDouOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouRefundMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouRefundMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsDouRefundMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouRefundMapper.java index 4809ea39..dc99c10a 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsDouRefundMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsDouRefundMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsDouRefund; +import cn.qihangerp.oms.domain.OmsDouRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdAfterSaleMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdAfterSaleMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsJdAfterSaleMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdAfterSaleMapper.java index 99fd2c1a..5cec9460 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdAfterSaleMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdAfterSaleMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsJdAfterSale; +import cn.qihangerp.oms.domain.OmsJdAfterSale; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdGoodsSkuMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdGoodsSkuMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsJdGoodsSkuMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdGoodsSkuMapper.java index bbc7cb2c..6b5c5003 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdGoodsSkuMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdGoodsSkuMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsJdGoodsSku; +import cn.qihangerp.oms.domain.OmsJdGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderItemMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderItemMapper.java index 17e5ca9f..0f8ee679 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderItemMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsJdOrderItem; +import cn.qihangerp.oms.domain.OmsJdOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderMapper.java index f8ce629d..c1d096ba 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsJdOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsJdOrder; +import cn.qihangerp.oms.domain.OmsJdOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddGoodsSkuMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddGoodsSkuMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsPddGoodsSkuMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddGoodsSkuMapper.java index 22b3992b..97df6156 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddGoodsSkuMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddGoodsSkuMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsPddGoodsSku; +import cn.qihangerp.oms.domain.OmsPddGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderItemMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderItemMapper.java index a9956e65..443d7e38 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderItemMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsPddOrderItem; +import cn.qihangerp.oms.domain.OmsPddOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderMapper.java index 38a9c18f..df81eace 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsPddOrder; +import cn.qihangerp.oms.domain.OmsPddOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddRefundMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddRefundMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsPddRefundMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddRefundMapper.java index 89c25dd9..8a232b79 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsPddRefundMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsPddRefundMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsPddRefund; +import cn.qihangerp.oms.domain.OmsPddRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoGoodsSkuMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoGoodsSkuMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoGoodsSkuMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoGoodsSkuMapper.java index 954fcd28..f60e936e 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoGoodsSkuMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoGoodsSkuMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsTaoGoodsSku; +import cn.qihangerp.oms.domain.OmsTaoGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderItemMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderItemMapper.java index 53b9ed1c..68dfe92c 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderItemMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsTaoOrderItem; +import cn.qihangerp.oms.domain.OmsTaoOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderMapper.java index 04429a3e..555fa786 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsTaoOrder; +import cn.qihangerp.oms.domain.OmsTaoOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoRefundMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoRefundMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoRefundMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoRefundMapper.java index 5f1883ab..a881f442 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsTaoRefundMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsTaoRefundMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsTaoRefund; +import cn.qihangerp.oms.domain.OmsTaoRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiGoodsSkuMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiGoodsSkuMapper.java similarity index 79% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiGoodsSkuMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiGoodsSkuMapper.java index 29fe56fb..e10b4598 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiGoodsSkuMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiGoodsSkuMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsWeiGoodsSku; +import cn.qihangerp.oms.domain.OmsWeiGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderItemMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderItemMapper.java similarity index 79% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderItemMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderItemMapper.java index 73cbff28..46850e43 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderItemMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderItemMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsWeiOrderItem; +import cn.qihangerp.oms.domain.OmsWeiOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderMapper.java similarity index 79% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderMapper.java index 6baf1650..8be22c63 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiOrderMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiOrderMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsWeiOrder; +import cn.qihangerp.oms.domain.OmsWeiOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiRefundMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiRefundMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiRefundMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiRefundMapper.java index c9fd1985..6770ee2a 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/OmsWeiRefundMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/OmsWeiRefundMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.OmsWeiRefund; +import cn.qihangerp.oms.domain.OmsWeiRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SysLogisticsCompanyMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java similarity index 80% rename from oms-api/src/main/java/com/qihang/oms/mapper/SysLogisticsCompanyMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java index fdbe6466..5863d9e8 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SysLogisticsCompanyMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.oms.domain.SysLogisticsCompany; +import cn.qihangerp.oms.domain.SysLogisticsCompany; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java b/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysUserMapper.java similarity index 97% rename from oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java rename to oms-api/src/main/java/cn/qihangerp/oms/mapper/SysUserMapper.java index b2f217df..5436e553 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysUserMapper.java @@ -1,6 +1,6 @@ -package com.qihang.oms.mapper; +package cn.qihangerp.oms.mapper; -import com.qihang.security.entity.SysUser; +import cn.qihangerp.security.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/oms-api/src/main/java/com/qihang/oms/mq/ApiMessageReceiver.java b/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java similarity index 90% rename from oms-api/src/main/java/com/qihang/oms/mq/ApiMessageReceiver.java rename to oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java index cbe0b939..51162dbf 100644 --- a/oms-api/src/main/java/com/qihang/oms/mq/ApiMessageReceiver.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java @@ -1,12 +1,12 @@ -package com.qihang.oms.mq; +package cn.qihangerp.oms.mq; +import cn.qihangerp.oms.service.ErpSaleOrderService; import com.alibaba.fastjson2.JSON; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; -import com.qihang.common.utils.SpringUtils; -import com.qihang.oms.service.ErpSaleOrderService; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; +import cn.qihangerp.common.utils.SpringUtils; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oms-api/src/main/java/com/qihang/oms/mq/KafkaMQConsumer.java b/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java similarity index 93% rename from oms-api/src/main/java/com/qihang/oms/mq/KafkaMQConsumer.java rename to oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java index a374470e..db56e7dd 100644 --- a/oms-api/src/main/java/com/qihang/oms/mq/KafkaMQConsumer.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java @@ -1,16 +1,15 @@ -package com.qihang.oms.mq; +package cn.qihangerp.oms.mq; +import cn.qihangerp.oms.service.ErpSaleOrderService; import com.alibaba.fastjson2.JSON; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; -import com.qihang.oms.service.ErpSaleAfterRefundService; -import com.qihang.oms.service.ErpSaleOrderService; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; +import cn.qihangerp.oms.service.ErpSaleAfterRefundService; import lombok.AllArgsConstructor; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.redis.connection.Message; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Component; diff --git a/oms-api/src/main/java/com/qihang/oms/mq/MqMessage.java b/oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java similarity index 90% rename from oms-api/src/main/java/com/qihang/oms/mq/MqMessage.java rename to oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java index 06fc73d0..2c00e0a6 100644 --- a/oms-api/src/main/java/com/qihang/oms/mq/MqMessage.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java @@ -1,4 +1,4 @@ -package com.qihang.oms.mq;//package com.qihang.sys.api.mq; +package cn.qihangerp.oms.mq;//package com.qihang.sys.api.mq; // //import lombok.Data; // diff --git a/oms-api/src/main/java/com/qihang/oms/mq/MqUtils.java b/oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java similarity index 89% rename from oms-api/src/main/java/com/qihang/oms/mq/MqUtils.java rename to oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java index 9fbbf469..da97ef71 100644 --- a/oms-api/src/main/java/com/qihang/oms/mq/MqUtils.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java @@ -1,4 +1,4 @@ -package com.qihang.oms.mq;//package com.qihang.sys.api.mq; +package cn.qihangerp.oms.mq;//package com.qihang.sys.api.mq; // //import lombok.AllArgsConstructor; //import org.springframework.data.redis.core.RedisTemplate; diff --git a/oms-api/src/main/java/com/qihang/oms/mq/SubscriberConfig.java b/oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/mq/SubscriberConfig.java rename to oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java index 1bd006c8..bba810be 100644 --- a/oms-api/src/main/java/com/qihang/oms/mq/SubscriberConfig.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java @@ -1,4 +1,4 @@ -package com.qihang.oms.mq; +package cn.qihangerp.oms.mq; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterInfoService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterInfoService.java similarity index 69% rename from oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterInfoService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterInfoService.java index e8d8bc6a..26d919b7 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterInfoService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterInfoService.java @@ -1,8 +1,8 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleAfterInfo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpSaleAfterInfo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterRefundService.java similarity index 72% rename from oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterRefundService.java index ac09a141..6dab0b6f 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleAfterRefundService.java @@ -1,11 +1,10 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.oms.domain.ErpSaleAfterRefund; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.oms.domain.ErpSaleAfterRefund; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.oms.domain.ErpSaleOrder; /** * @author TW diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderItemService.java similarity index 58% rename from oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderItemService.java index 821ad40a..01fa8095 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderItemService.java @@ -1,11 +1,11 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleOrderItem; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpSaleOrderItem; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.oms.domain.bo.OrderItemListBo; -import com.qihang.oms.domain.vo.OrderItemListVo; +import cn.qihangerp.oms.domain.bo.OrderItemListBo; +import cn.qihangerp.oms.domain.vo.OrderItemListVo; /** * @author TW diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderService.java similarity index 83% rename from oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderService.java index 3ccd012a..25441a5f 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpSaleOrderService.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.oms.domain.ErpSaleOrder; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.oms.domain.ErpSaleOrder; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpShipStockUpService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipStockUpService.java similarity index 58% rename from oms-api/src/main/java/com/qihang/oms/service/ErpShipStockUpService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipStockUpService.java index cfeb0882..0b2328b2 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpShipStockUpService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipStockUpService.java @@ -1,11 +1,10 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.domain.ErpShipStockUp; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpShipStockUp; +import cn.qihangerp.oms.domain.bo.ShipStockUpBo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.oms.domain.bo.ShipStockUpBo; /** * @author TW diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpShipWaybillService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipWaybillService.java similarity index 55% rename from oms-api/src/main/java/com/qihang/oms/service/ErpShipWaybillService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipWaybillService.java index 549a04f5..fb7964e4 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/ErpShipWaybillService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/ErpShipWaybillService.java @@ -1,12 +1,10 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpShipStockUp; -import com.qihang.oms.domain.ErpShipWaybill; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpShipWaybill; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.oms.domain.bo.ShipStockUpBo; -import com.qihang.oms.domain.bo.ShipWaybillBo; +import cn.qihangerp.oms.domain.bo.ShipWaybillBo; /** * @author TW diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPlatformService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPlatformService.java new file mode 100644 index 00000000..6a9ec18b --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPlatformService.java @@ -0,0 +1,14 @@ +package cn.qihangerp.oms.service; + + +import cn.qihangerp.oms.domain.OShopPlatform; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_shop_platform(店铺平台配置表)】的数据库操作Service +* @createDate 2024-07-27 18:06:22 +*/ +public interface OShopPlatformService extends IService { + OShopPlatform selectById(Integer id); +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLasttimeService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLasttimeService.java new file mode 100644 index 00000000..5e05a5ff --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLasttimeService.java @@ -0,0 +1,18 @@ +package cn.qihangerp.oms.service; + + +import cn.qihangerp.oms.domain.OShopPullLasttime; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** +* @author TW +* @description 针对表【sys_shop_pull_lasttime(店铺更新最后时间记录)】的数据库操作Service +* @createDate 2024-06-04 16:13:03 +*/ +public interface OShopPullLasttimeService extends IService { + OShopPullLasttime getLasttimeByShop(Long shopId, String pullType); + + List getLasttimeByShop(Long shopId); +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLogsService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLogsService.java new file mode 100644 index 00000000..def17971 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLogsService.java @@ -0,0 +1,17 @@ +package cn.qihangerp.oms.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; + +import cn.qihangerp.oms.domain.OShopPullLogs; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Service +* @createDate 2024-03-22 17:43:38 +*/ +public interface OShopPullLogsService extends IService { + + PageResult queryPageList(OShopPullLogs bo, PageQuery pageQuery); +} diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/OShopService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopService.java new file mode 100644 index 00000000..f1e2ae36 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OShopService.java @@ -0,0 +1,32 @@ +package cn.qihangerp.oms.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.enums.EnumShopType; + +import cn.qihangerp.oms.domain.OShop; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service +* @createDate 2024-03-17 15:17:34 +*/ +public interface OShopService extends IService { + PageResult queryPageList(OShop bo, PageQuery pageQuery); + List selectShopList(OShop shop); + OShop selectShopById(Long id); + int updateShopById(OShop shop); + int insertShop(OShop shop); + + int deleteShopByIds(Long[] ids); +// List selectShopPlatformList(); +// SysPlatform selectShopPlatformById(Long id); +// int updateShopPlatformById(SysPlatform platform); + List selectShopByShopType(EnumShopType shopType); + void updateSessionKey(Long shopId,String sessionKey); + +// void updateShopManage(Long shopId,Long userId,Long groupId); +} diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsDouGoodsSkuService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouGoodsSkuService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsDouGoodsSkuService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouGoodsSkuService.java index 85a3c20b..adc29800 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsDouGoodsSkuService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouGoodsSkuService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsDouGoodsSku; +import cn.qihangerp.oms.domain.OmsDouGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderItemService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderItemService.java index ffabb0f5..f24d7eff 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderItemService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsDouOrderItem; +import cn.qihangerp.oms.domain.OmsDouOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderService.java index dac1c727..deef1f14 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsDouOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouOrderService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsDouOrder; +import cn.qihangerp.oms.domain.OmsDouOrder; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsDouRefundService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouRefundService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsDouRefundService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouRefundService.java index 3a120cbb..854e2a94 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsDouRefundService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsDouRefundService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsDouRefund; +import cn.qihangerp.oms.domain.OmsDouRefund; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsJdAfterSaleService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdAfterSaleService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsJdAfterSaleService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdAfterSaleService.java index c53d44a8..e6b05c8d 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsJdAfterSaleService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdAfterSaleService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsJdAfterSale; +import cn.qihangerp.oms.domain.OmsJdAfterSale; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsJdGoodsSkuService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdGoodsSkuService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsJdGoodsSkuService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdGoodsSkuService.java index 7ece40e9..e06f34d9 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsJdGoodsSkuService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdGoodsSkuService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsJdGoodsSku; +import cn.qihangerp.oms.domain.OmsJdGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderItemService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderItemService.java index c158dc59..ac9b1c79 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderItemService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsJdOrderItem; +import cn.qihangerp.oms.domain.OmsJdOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderService.java index d7412b95..75840390 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsJdOrderService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsJdOrder; +import cn.qihangerp.oms.domain.OmsJdOrder; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsPddGoodsSkuService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddGoodsSkuService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsPddGoodsSkuService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddGoodsSkuService.java index 908f2a94..8ec26a25 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsPddGoodsSkuService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddGoodsSkuService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsPddGoodsSku; +import cn.qihangerp.oms.domain.OmsPddGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderItemService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderItemService.java index 89713bc8..cf5eb041 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderItemService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsPddOrderItem; +import cn.qihangerp.oms.domain.OmsPddOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderService.java index f279459d..c2ab9a46 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsPddOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddOrderService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsPddOrder; +import cn.qihangerp.oms.domain.OmsPddOrder; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsPddRefundService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddRefundService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsPddRefundService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddRefundService.java index 43f1c1ff..eba5b919 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsPddRefundService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsPddRefundService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsPddRefund; +import cn.qihangerp.oms.domain.OmsPddRefund; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoGoodsSkuService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoGoodsSkuService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsTaoGoodsSkuService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoGoodsSkuService.java index 056f7d3b..c7be9625 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoGoodsSkuService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoGoodsSkuService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsTaoGoodsSku; +import cn.qihangerp.oms.domain.OmsTaoGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderItemService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderItemService.java index db1bf460..54a64582 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderItemService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsTaoOrderItem; +import cn.qihangerp.oms.domain.OmsTaoOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderService.java index 510542a0..7105479a 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoOrderService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsTaoOrder; +import cn.qihangerp.oms.domain.OmsTaoOrder; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoRefundService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoRefundService.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/OmsTaoRefundService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoRefundService.java index 96ae10f1..443285cf 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsTaoRefundService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsTaoRefundService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsTaoRefund; +import cn.qihangerp.oms.domain.OmsTaoRefund; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiGoodsSkuService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiGoodsSkuService.java similarity index 76% rename from oms-api/src/main/java/com/qihang/oms/service/OmsWeiGoodsSkuService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiGoodsSkuService.java index 25798b0c..66b8e13a 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiGoodsSkuService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiGoodsSkuService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsWeiGoodsSku; +import cn.qihangerp.oms.domain.OmsWeiGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderItemService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderItemService.java similarity index 76% rename from oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderItemService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderItemService.java index 61325c92..df0166db 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderItemService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderItemService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsWeiOrderItem; +import cn.qihangerp.oms.domain.OmsWeiOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderService.java similarity index 76% rename from oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderService.java index c767fb49..6b515ab9 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiOrderService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiOrderService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsWeiOrder; +import cn.qihangerp.oms.domain.OmsWeiOrder; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiRefundService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiRefundService.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/OmsWeiRefundService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiRefundService.java index c4dbfbbe..c3da8ae6 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OmsWeiRefundService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/OmsWeiRefundService.java @@ -1,6 +1,6 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.oms.domain.OmsWeiRefund; +import cn.qihangerp.oms.domain.OmsWeiRefund; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/SShopPlatformService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/SShopPlatformService.java new file mode 100644 index 00000000..65ff598b --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/SShopPlatformService.java @@ -0,0 +1,13 @@ +//package cn.qihangerp.oms.service; +// +//import cn.qihangerp.oms.domain.SShopPlatform; +//import com.baomidou.mybatisplus.extension.service.IService; +// +///** +//* @author TW +//* @description 针对表【s_shop_platform(电商平台配置表)】的数据库操作Service +//* @createDate 2024-06-04 14:53:08 +//*/ +//public interface SShopPlatformService extends IService { +// +//} diff --git a/oms-api/src/main/java/com/qihang/oms/service/SysLogisticsCompanyService.java b/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java similarity index 70% rename from oms-api/src/main/java/com/qihang/oms/service/SysLogisticsCompanyService.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java index d5f0b7c2..b4a725d6 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/SysLogisticsCompanyService.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java @@ -1,8 +1,8 @@ -package com.qihang.oms.service; +package cn.qihangerp.oms.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.SysLogisticsCompany; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.SysLogisticsCompany; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterInfoServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterInfoServiceImpl.java similarity index 78% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterInfoServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterInfoServiceImpl.java index 67c869d3..7ae65850 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterInfoServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterInfoServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.ErpSaleAfterInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleAfterInfo; -import com.qihang.oms.service.ErpSaleAfterInfoService; -import com.qihang.oms.mapper.ErpSaleAfterInfoMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpSaleAfterInfo; +import cn.qihangerp.oms.mapper.ErpSaleAfterInfoMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service public class ErpSaleAfterInfoServiceImpl extends ServiceImpl - implements ErpSaleAfterInfoService{ + implements ErpSaleAfterInfoService { private final ErpSaleAfterInfoMapper mapper; @Override public PageResult queryPageList(ErpSaleAfterInfo bo, PageQuery pageQuery) { diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterRefundServiceImpl.java similarity index 99% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterRefundServiceImpl.java index a5e9d044..56ef7c82 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleAfterRefundServiceImpl.java @@ -1,17 +1,17 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.oms.domain.*; +import cn.qihangerp.oms.mapper.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.oms.domain.*; -import com.qihang.oms.mapper.*; -import com.qihang.oms.service.ErpSaleAfterRefundService; -import com.qihang.oms.service.OmsWeiRefundService; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; + +import cn.qihangerp.oms.service.ErpSaleAfterRefundService; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.stereotype.Service; diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderItemServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderItemServiceImpl.java index c6b0c0dc..d88adf0c 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderItemServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.ErpSaleOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleOrderItem; -import com.qihang.oms.domain.bo.OrderItemListBo; -import com.qihang.oms.domain.vo.OrderItemListVo; -import com.qihang.oms.service.ErpSaleOrderItemService; -import com.qihang.oms.mapper.ErpSaleOrderItemMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpSaleOrderItem; +import cn.qihangerp.oms.domain.bo.OrderItemListBo; +import cn.qihangerp.oms.domain.vo.OrderItemListVo; +import cn.qihangerp.oms.mapper.ErpSaleOrderItemMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service public class ErpSaleOrderItemServiceImpl extends ServiceImpl - implements ErpSaleOrderItemService{ + implements ErpSaleOrderItemService { private final ErpSaleOrderItemMapper mapper; @Override diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderServiceImpl.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderServiceImpl.java index b93ba61a..c4adca7d 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpSaleOrderServiceImpl.java @@ -1,27 +1,26 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.utils.DateUtils; +import cn.qihangerp.oms.domain.*; +import cn.qihangerp.oms.mapper.*; +import cn.qihangerp.oms.service.ErpSaleOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.JdOrderStateEnum; -import com.qihang.common.enums.TaoOrderStateEnum; -import com.qihang.common.utils.DateUtils; -import com.qihang.common.utils.StringUtils; -import com.qihang.oms.domain.*; -import com.qihang.oms.mapper.*; -import com.qihang.oms.service.ErpSaleOrderService; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.JdOrderStateEnum; +import cn.qihangerp.common.enums.TaoOrderStateEnum; +import cn.qihangerp.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -34,7 +33,7 @@ import java.util.List; @AllArgsConstructor @Service public class ErpSaleOrderServiceImpl extends ServiceImpl - implements ErpSaleOrderService{ + implements ErpSaleOrderService { private final ErpSaleOrderMapper orderMapper; private final ErpSaleOrderItemMapper orderItemMapper; diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipStockUpServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipStockUpServiceImpl.java similarity index 75% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipStockUpServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipStockUpServiceImpl.java index e3572318..82caf505 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipStockUpServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipStockUpServiceImpl.java @@ -1,16 +1,14 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpSaleOrder; -import com.qihang.oms.domain.ErpSaleOrderItem; -import com.qihang.oms.domain.ErpShipStockUp; -import com.qihang.oms.domain.bo.ShipStockUpBo; -import com.qihang.oms.service.ErpShipStockUpService; -import com.qihang.oms.mapper.ErpShipStockUpMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpShipStockUp; +import cn.qihangerp.oms.domain.bo.ShipStockUpBo; +import cn.qihangerp.oms.service.ErpShipStockUpService; +import cn.qihangerp.oms.mapper.ErpShipStockUpMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipWaybillServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipWaybillServiceImpl.java similarity index 74% rename from oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipWaybillServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipWaybillServiceImpl.java index e8ed99ab..d73cb31b 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpShipWaybillServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/ErpShipWaybillServiceImpl.java @@ -1,16 +1,14 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.ErpShipWaybillService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.ErpShipStockUp; -import com.qihang.oms.domain.ErpShipWaybill; -import com.qihang.oms.domain.bo.ShipStockUpBo; -import com.qihang.oms.domain.bo.ShipWaybillBo; -import com.qihang.oms.service.ErpShipWaybillService; -import com.qihang.oms.mapper.ErpShipWaybillMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.ErpShipWaybill; +import cn.qihangerp.oms.domain.bo.ShipWaybillBo; +import cn.qihangerp.oms.mapper.ErpShipWaybillMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -23,7 +21,7 @@ import org.springframework.util.StringUtils; @AllArgsConstructor @Service public class ErpShipWaybillServiceImpl extends ServiceImpl - implements ErpShipWaybillService{ + implements ErpShipWaybillService { private final ErpShipWaybillMapper mapper; @Override public PageResult queryPageList(ShipWaybillBo bo, PageQuery pageQuery) { diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPlatformServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPlatformServiceImpl.java new file mode 100644 index 00000000..9f65fa3a --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPlatformServiceImpl.java @@ -0,0 +1,29 @@ +package cn.qihangerp.oms.service.impl; + + +import cn.qihangerp.oms.domain.OShopPlatform; +import cn.qihangerp.oms.mapper.OShopPlatformMapper; +import cn.qihangerp.oms.service.OShopPlatformService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_shop_platform(店铺平台配置表)】的数据库操作Service实现 +* @createDate 2024-07-27 18:06:22 +*/ +@AllArgsConstructor +@Service +public class OShopPlatformServiceImpl extends ServiceImpl + implements OShopPlatformService { + private final OShopPlatformMapper mapper; + @Override + public OShopPlatform selectById(Integer id) { + return mapper.selectById(id); + } +} + + + + diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLasttimeServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLasttimeServiceImpl.java new file mode 100644 index 00000000..adda20b2 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLasttimeServiceImpl.java @@ -0,0 +1,43 @@ +package cn.qihangerp.oms.service.impl; + + +import cn.qihangerp.oms.domain.OShopPullLasttime; +import cn.qihangerp.oms.mapper.OShopPullLasttimeMapper; +import cn.qihangerp.oms.service.OShopPullLasttimeService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @author TW +* @description 针对表【sys_shop_pull_lasttime(店铺更新最后时间记录)】的数据库操作Service实现 +* @createDate 2024-06-04 16:13:03 +*/ +@AllArgsConstructor +@Service +public class OShopPullLasttimeServiceImpl extends ServiceImpl + implements OShopPullLasttimeService { + private final OShopPullLasttimeMapper mapper; + + @Override + public OShopPullLasttime getLasttimeByShop(Long shopId, String pullType) { + List oShopPullLasttimes = mapper.selectList(new LambdaQueryWrapper().eq(OShopPullLasttime::getShopId, shopId).eq(OShopPullLasttime::getPullType, pullType)); + if(oShopPullLasttimes != null && !oShopPullLasttimes.isEmpty()) return oShopPullLasttimes.get(0); + else return null; + } + + @Override + public List getLasttimeByShop(Long shopId) { + List list = mapper.selectList(new LambdaQueryWrapper() + .eq(OShopPullLasttime::getShopId, shopId)); + + return list; + } +} + + + + diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLogsServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLogsServiceImpl.java new file mode 100644 index 00000000..e895450a --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopPullLogsServiceImpl.java @@ -0,0 +1,41 @@ +package cn.qihangerp.oms.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; + +import cn.qihangerp.oms.domain.OShopPullLogs; +import cn.qihangerp.oms.mapper.OShopPullLogsMapper; +import cn.qihangerp.oms.service.OShopPullLogsService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author TW +* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Service实现 +* @createDate 2024-03-22 17:43:38 +*/ +@AllArgsConstructor +@Service +public class OShopPullLogsServiceImpl extends ServiceImpl + implements OShopPullLogsService { + private final OShopPullLogsMapper mapper; + + @Override + public PageResult queryPageList(OShopPullLogs bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(bo.getShopId()!=null, OShopPullLogs::getShopId,bo.getShopId()); + queryWrapper.eq(bo.getShopType()!=null, OShopPullLogs::getShopType,bo.getShopType()); + queryWrapper.eq(StringUtils.hasText(bo.getPullType()), OShopPullLogs::getPullType,bo.getPullType()); + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } +} + + + + diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopServiceImpl.java new file mode 100644 index 00000000..cbee3a84 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OShopServiceImpl.java @@ -0,0 +1,120 @@ +package cn.qihangerp.oms.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.enums.EnumShopType; + +import cn.qihangerp.oms.domain.OShop; +import cn.qihangerp.oms.domain.OShopPullLasttime; +import cn.qihangerp.oms.mapper.OShopMapper; +import cn.qihangerp.oms.service.OShopPullLasttimeService; +import cn.qihangerp.oms.service.OShopService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.Arrays; +import java.util.List; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service实现 +* @createDate 2024-03-17 15:17:34 +*/ +@AllArgsConstructor +@Service +public class OShopServiceImpl extends ServiceImpl + implements OShopService { + private final OShopMapper mapper; + private final OShopPullLasttimeService pullLasttimeService; + + @Override + public PageResult queryPageList(OShop bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .likeRight(StringUtils.hasText(bo.getName()), OShop::getName, bo.getName()) + .eq(bo.getType()!=null, OShop::getType, bo.getType()); + + + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + return PageResult.build(pages); + } + + @Override + public List selectShopList(OShop shop) { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(shop.getType()!=null, OShop::getType,shop.getType()) + + ; + return mapper.selectList(qw); + } + + @Override + public OShop selectShopById(Long id) { + return mapper.selectById(id); + } + + @Override + public int updateShopById(OShop shop) { + return mapper.updateById(shop); + } + + @Override + public int insertShop(OShop shop) { + return mapper.insert(shop); + } + + @Override + public int deleteShopByIds(Long[] ids) { + //删除pulllasttime + pullLasttimeService.remove(new LambdaQueryWrapper().in(OShopPullLasttime::getShopId,ids)); + return mapper.deleteBatchIds(Arrays.asList(ids)); + } + + + @Override + public List selectShopByShopType(EnumShopType shopType) { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(OShop::getType,shopType.getIndex()) + .eq(OShop::getStatus,1); + return mapper.selectList(qw); + } + + @Override + public void updateSessionKey(Long shopId, String sessionKey) { + OShop shop = new OShop(); + shop.setId(shopId); + shop.setAccessToken(sessionKey); + mapper.updateById(shop); + } + +// @Override +// public void updateShopManage(Long shopId, Long userId, Long groupId) { +// OShop shop = new OShop(); +// shop.setId(shopId); +// shop.setManageUserId(userId); +// shop.setShopGroupId(groupId); +// shop.setModifyOn(System.currentTimeMillis()/1000); +// mapper.updateById(shop); +// } +// @Override +// public List selectShopPlatformList() { +// return platformMapper.selectList(new LambdaQueryWrapper<>()); +// } +// +// @Override +// public SysPlatform selectShopPlatformById(Long id) { +// return platformMapper.selectById(id); +// } +// +// @Override +// public int updateShopPlatformById(SysPlatform platform) { +// return platformMapper.updateById(platform); +// } +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouGoodsSkuServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouGoodsSkuServiceImpl.java similarity index 68% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouGoodsSkuServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouGoodsSkuServiceImpl.java index e4bd2425..06c55b04 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouGoodsSkuServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouGoodsSkuServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsDouGoodsSku; -import com.qihang.oms.service.OmsDouGoodsSkuService; -import com.qihang.oms.mapper.OmsDouGoodsSkuMapper; +import cn.qihangerp.oms.domain.OmsDouGoodsSku; +import cn.qihangerp.oms.service.OmsDouGoodsSkuService; +import cn.qihangerp.oms.mapper.OmsDouGoodsSkuMapper; import org.springframework.stereotype.Service; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderItemServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderItemServiceImpl.java index 9e600cb5..aff04135 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsDouOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsDouOrderItem; -import com.qihang.oms.service.OmsDouOrderItemService; -import com.qihang.oms.mapper.OmsDouOrderItemMapper; +import cn.qihangerp.oms.domain.OmsDouOrderItem; +import cn.qihangerp.oms.mapper.OmsDouOrderItemMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsDouOrderItemServiceImpl extends ServiceImpl - implements OmsDouOrderItemService{ + implements OmsDouOrderItemService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderServiceImpl.java index 9d16224b..8e71a842 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouOrderServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsDouOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsDouOrder; -import com.qihang.oms.service.OmsDouOrderService; -import com.qihang.oms.mapper.OmsDouOrderMapper; +import cn.qihangerp.oms.domain.OmsDouOrder; +import cn.qihangerp.oms.mapper.OmsDouOrderMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsDouOrderServiceImpl extends ServiceImpl - implements OmsDouOrderService{ + implements OmsDouOrderService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouRefundServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouRefundServiceImpl.java similarity index 68% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouRefundServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouRefundServiceImpl.java index f7dbbe76..8b2a23eb 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsDouRefundServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsDouRefundServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsDouRefund; -import com.qihang.oms.service.OmsDouRefundService; -import com.qihang.oms.mapper.OmsDouRefundMapper; +import cn.qihangerp.oms.domain.OmsDouRefund; +import cn.qihangerp.oms.service.OmsDouRefundService; +import cn.qihangerp.oms.mapper.OmsDouRefundMapper; import org.springframework.stereotype.Service; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdAfterSaleServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdAfterSaleServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdAfterSaleServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdAfterSaleServiceImpl.java index 049be664..ba15ae26 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdAfterSaleServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdAfterSaleServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsJdAfterSaleService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsJdAfterSale; -import com.qihang.oms.service.OmsJdAfterSaleService; -import com.qihang.oms.mapper.OmsJdAfterSaleMapper; +import cn.qihangerp.oms.domain.OmsJdAfterSale; +import cn.qihangerp.oms.mapper.OmsJdAfterSaleMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsJdAfterSaleServiceImpl extends ServiceImpl - implements OmsJdAfterSaleService{ + implements OmsJdAfterSaleService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdGoodsSkuServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdGoodsSkuServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdGoodsSkuServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdGoodsSkuServiceImpl.java index e98e529a..79017a34 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdGoodsSkuServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdGoodsSkuServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsJdGoodsSkuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsJdGoodsSku; -import com.qihang.oms.service.OmsJdGoodsSkuService; -import com.qihang.oms.mapper.OmsJdGoodsSkuMapper; +import cn.qihangerp.oms.domain.OmsJdGoodsSku; +import cn.qihangerp.oms.mapper.OmsJdGoodsSkuMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsJdGoodsSkuServiceImpl extends ServiceImpl - implements OmsJdGoodsSkuService{ + implements OmsJdGoodsSkuService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderItemServiceImpl.java similarity index 68% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderItemServiceImpl.java index d7d825f9..d2317c7d 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsJdOrderItem; -import com.qihang.oms.service.OmsJdOrderItemService; -import com.qihang.oms.mapper.OmsJdOrderItemMapper; +import cn.qihangerp.oms.domain.OmsJdOrderItem; +import cn.qihangerp.oms.service.OmsJdOrderItemService; +import cn.qihangerp.oms.mapper.OmsJdOrderItemMapper; import org.springframework.stereotype.Service; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderServiceImpl.java index 8fb2936d..252ceabb 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsJdOrderServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsJdOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsJdOrder; -import com.qihang.oms.service.OmsJdOrderService; -import com.qihang.oms.mapper.OmsJdOrderMapper; +import cn.qihangerp.oms.domain.OmsJdOrder; +import cn.qihangerp.oms.mapper.OmsJdOrderMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsJdOrderServiceImpl extends ServiceImpl - implements OmsJdOrderService{ + implements OmsJdOrderService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddGoodsSkuServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddGoodsSkuServiceImpl.java similarity index 68% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddGoodsSkuServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddGoodsSkuServiceImpl.java index 0161ac7d..da2faa7d 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddGoodsSkuServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddGoodsSkuServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsPddGoodsSku; -import com.qihang.oms.service.OmsPddGoodsSkuService; -import com.qihang.oms.mapper.OmsPddGoodsSkuMapper; +import cn.qihangerp.oms.domain.OmsPddGoodsSku; +import cn.qihangerp.oms.service.OmsPddGoodsSkuService; +import cn.qihangerp.oms.mapper.OmsPddGoodsSkuMapper; import org.springframework.stereotype.Service; /** diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderItemServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderItemServiceImpl.java index c193efa3..83cc2cb1 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsPddOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsPddOrderItem; -import com.qihang.oms.service.OmsPddOrderItemService; -import com.qihang.oms.mapper.OmsPddOrderItemMapper; +import cn.qihangerp.oms.domain.OmsPddOrderItem; +import cn.qihangerp.oms.mapper.OmsPddOrderItemMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsPddOrderItemServiceImpl extends ServiceImpl - implements OmsPddOrderItemService{ + implements OmsPddOrderItemService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderServiceImpl.java index f581f713..5e55640b 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddOrderServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsPddOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsPddOrder; -import com.qihang.oms.service.OmsPddOrderService; -import com.qihang.oms.mapper.OmsPddOrderMapper; +import cn.qihangerp.oms.domain.OmsPddOrder; +import cn.qihangerp.oms.mapper.OmsPddOrderMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsPddOrderServiceImpl extends ServiceImpl - implements OmsPddOrderService{ + implements OmsPddOrderService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddRefundServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddRefundServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddRefundServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddRefundServiceImpl.java index e0c12243..8fcdba18 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsPddRefundServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsPddRefundServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsPddRefundService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsPddRefund; -import com.qihang.oms.service.OmsPddRefundService; -import com.qihang.oms.mapper.OmsPddRefundMapper; +import cn.qihangerp.oms.domain.OmsPddRefund; +import cn.qihangerp.oms.mapper.OmsPddRefundMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsPddRefundServiceImpl extends ServiceImpl - implements OmsPddRefundService{ + implements OmsPddRefundService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java index e86775b3..cb9440d9 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoGoodsSkuServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsTaoGoodsSkuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsTaoGoodsSku; -import com.qihang.oms.service.OmsTaoGoodsSkuService; -import com.qihang.oms.mapper.OmsTaoGoodsSkuMapper; +import cn.qihangerp.oms.domain.OmsTaoGoodsSku; +import cn.qihangerp.oms.mapper.OmsTaoGoodsSkuMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsTaoGoodsSkuServiceImpl extends ServiceImpl - implements OmsTaoGoodsSkuService{ + implements OmsTaoGoodsSkuService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderItemServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderItemServiceImpl.java index 364bc8be..7f74ff13 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsTaoOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsTaoOrderItem; -import com.qihang.oms.service.OmsTaoOrderItemService; -import com.qihang.oms.mapper.OmsTaoOrderItemMapper; +import cn.qihangerp.oms.domain.OmsTaoOrderItem; +import cn.qihangerp.oms.mapper.OmsTaoOrderItemMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsTaoOrderItemServiceImpl extends ServiceImpl - implements OmsTaoOrderItemService{ + implements OmsTaoOrderItemService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderServiceImpl.java index deaf4550..be7a1b14 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoOrderServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsTaoOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsTaoOrder; -import com.qihang.oms.service.OmsTaoOrderService; -import com.qihang.oms.mapper.OmsTaoOrderMapper; +import cn.qihangerp.oms.domain.OmsTaoOrder; +import cn.qihangerp.oms.mapper.OmsTaoOrderMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsTaoOrderServiceImpl extends ServiceImpl - implements OmsTaoOrderService{ + implements OmsTaoOrderService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoRefundServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoRefundServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoRefundServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoRefundServiceImpl.java index dc7000cc..f49a2af3 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsTaoRefundServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsTaoRefundServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsTaoRefundService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsTaoRefund; -import com.qihang.oms.service.OmsTaoRefundService; -import com.qihang.oms.mapper.OmsTaoRefundMapper; +import cn.qihangerp.oms.domain.OmsTaoRefund; +import cn.qihangerp.oms.mapper.OmsTaoRefundMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsTaoRefundServiceImpl extends ServiceImpl - implements OmsTaoRefundService{ + implements OmsTaoRefundService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java similarity index 60% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java index 045315d1..67d7eb63 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiGoodsSkuServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsWeiGoodsSkuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsWeiGoodsSku; -import com.qihang.oms.service.OmsWeiGoodsSkuService; -import com.qihang.oms.mapper.OmsWeiGoodsSkuMapper; +import cn.qihangerp.oms.domain.OmsWeiGoodsSku; +import cn.qihangerp.oms.mapper.OmsWeiGoodsSkuMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsWeiGoodsSkuServiceImpl extends ServiceImpl - implements OmsWeiGoodsSkuService{ + implements OmsWeiGoodsSkuService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderItemServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderItemServiceImpl.java similarity index 60% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderItemServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderItemServiceImpl.java index 66630260..9a1ea839 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderItemServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsWeiOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsWeiOrderItem; -import com.qihang.oms.service.OmsWeiOrderItemService; -import com.qihang.oms.mapper.OmsWeiOrderItemMapper; +import cn.qihangerp.oms.domain.OmsWeiOrderItem; +import cn.qihangerp.oms.mapper.OmsWeiOrderItemMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsWeiOrderItemServiceImpl extends ServiceImpl - implements OmsWeiOrderItemService{ + implements OmsWeiOrderItemService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderServiceImpl.java similarity index 61% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderServiceImpl.java index ae52fa00..cebfe169 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiOrderServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiOrderServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsWeiOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsWeiOrder; -import com.qihang.oms.service.OmsWeiOrderService; -import com.qihang.oms.mapper.OmsWeiOrderMapper; +import cn.qihangerp.oms.domain.OmsWeiOrder; +import cn.qihangerp.oms.mapper.OmsWeiOrderMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsWeiOrderServiceImpl extends ServiceImpl - implements OmsWeiOrderService{ + implements OmsWeiOrderService { } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiRefundServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiRefundServiceImpl.java similarity index 62% rename from oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiRefundServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiRefundServiceImpl.java index feb8b2ef..b949aacb 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OmsWeiRefundServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/OmsWeiRefundServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.OmsWeiRefundService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.OmsWeiRefund; -import com.qihang.oms.service.OmsWeiRefundService; -import com.qihang.oms.mapper.OmsWeiRefundMapper; +import cn.qihangerp.oms.domain.OmsWeiRefund; +import cn.qihangerp.oms.mapper.OmsWeiRefundMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class OmsWeiRefundServiceImpl extends ServiceImpl - implements OmsWeiRefundService{ + implements OmsWeiRefundService { } diff --git a/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SShopPlatformServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SShopPlatformServiceImpl.java new file mode 100644 index 00000000..20aca3a6 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SShopPlatformServiceImpl.java @@ -0,0 +1,22 @@ +//package cn.qihangerp.oms.service.impl; +// +//import cn.qihangerp.oms.service.SShopPlatformService; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import cn.qihangerp.oms.domain.SShopPlatform; +//import cn.qihangerp.oms.mapper.SShopPlatformMapper; +//import org.springframework.stereotype.Service; +// +///** +//* @author TW +//* @description 针对表【s_shop_platform(电商平台配置表)】的数据库操作Service实现 +//* @createDate 2024-06-04 14:53:08 +//*/ +//@Service +//public class SShopPlatformServiceImpl extends ServiceImpl +// implements SShopPlatformService { +// +//} +// +// +// +// diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SysLogisticsCompanyServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java similarity index 77% rename from oms-api/src/main/java/com/qihang/oms/service/impl/SysLogisticsCompanyServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java index fbc705e1..34752eeb 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SysLogisticsCompanyServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; +import cn.qihangerp.oms.service.SysLogisticsCompanyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.SysLogisticsCompany; -import com.qihang.oms.service.SysLogisticsCompanyService; -import com.qihang.oms.mapper.SysLogisticsCompanyMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.oms.domain.SysLogisticsCompany; +import cn.qihangerp.oms.mapper.SysLogisticsCompanyMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service public class SysLogisticsCompanyServiceImpl extends ServiceImpl - implements SysLogisticsCompanyService{ + implements SysLogisticsCompanyService { private final SysLogisticsCompanyMapper mapper; @Override diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysUserServiceImpl.java similarity index 95% rename from oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java rename to oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysUserServiceImpl.java index b54ed2d9..3e55eeb2 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java +++ b/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysUserServiceImpl.java @@ -1,11 +1,11 @@ -package com.qihang.oms.service.impl; +package cn.qihangerp.oms.service.impl; -import com.qihang.common.common.ServiceException; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.StringUtils; -import com.qihang.oms.mapper.SysUserMapper; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.ISysUserService; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.oms.mapper.SysUserMapper; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/oms-api/src/main/java/com/qihang/oms/utils/BaseController.java b/oms-api/src/main/java/cn/qihangerp/oms/utils/BaseController.java similarity index 100% rename from oms-api/src/main/java/com/qihang/oms/utils/BaseController.java rename to oms-api/src/main/java/cn/qihangerp/oms/utils/BaseController.java diff --git a/oms-api/src/main/java/com/qihang/oms/utils/SecurityUtils.java b/oms-api/src/main/java/cn/qihangerp/oms/utils/SecurityUtils.java similarity index 100% rename from oms-api/src/main/java/com/qihang/oms/utils/SecurityUtils.java rename to oms-api/src/main/java/cn/qihangerp/oms/utils/SecurityUtils.java diff --git a/oms-api/src/main/java/cn/qihangerp/oms/vo/GoodsSpecListVo.java b/oms-api/src/main/java/cn/qihangerp/oms/vo/GoodsSpecListVo.java new file mode 100644 index 00000000..2930ad41 --- /dev/null +++ b/oms-api/src/main/java/cn/qihangerp/oms/vo/GoodsSpecListVo.java @@ -0,0 +1,103 @@ +//package cn.qihangerp.oms.vo; +// +// +//import java.math.BigDecimal; +// +//public class GoodsSpecListVo { +// +// private Long id; +// private Long goodsId; +// +// /** 商品名称 */ +// private String name; +// +// /** 商品编号 */ +// private String number; +// private String specNum; +// private String colorValue; +// /** 商品图片地址 */ +// private String colorImage; +// private String sizeValue; +// private String styleValue; +// private BigDecimal purPrice; +// +// public Long getId() { +// return id; +// } +// +// public void setId(Long id) { +// this.id = id; +// } +// +// public Long getGoodsId() { +// return goodsId; +// } +// +// public void setGoodsId(Long goodsId) { +// this.goodsId = goodsId; +// } +// +// public String getName() { +// return name; +// } +// +// public void setName(String name) { +// this.name = name; +// } +// +// public String getNumber() { +// return number; +// } +// +// public void setNumber(String number) { +// this.number = number; +// } +// +// public String getSpecNum() { +// return specNum; +// } +// +// public void setSpecNum(String specNum) { +// this.specNum = specNum; +// } +// +// public String getColorValue() { +// return colorValue; +// } +// +// public void setColorValue(String colorValue) { +// this.colorValue = colorValue; +// } +// +// public String getColorImage() { +// return colorImage; +// } +// +// public void setColorImage(String colorImage) { +// this.colorImage = colorImage; +// } +// +// public String getSizeValue() { +// return sizeValue; +// } +// +// public void setSizeValue(String sizeValue) { +// this.sizeValue = sizeValue; +// } +// +// public String getStyleValue() { +// return styleValue; +// } +// +// public void setStyleValue(String styleValue) { +// this.styleValue = styleValue; +// } +// +// public BigDecimal getPurPrice() { +// return purPrice; +// } +// +// public void setPurPrice(BigDecimal purPrice) { +// this.purPrice = purPrice; +// } +//} diff --git a/oms-api/src/main/java/com/qihang/oms/domain/SysShopPullLogs.java b/oms-api/src/main/java/com/qihang/oms/domain/SysShopPullLogs.java deleted file mode 100644 index b47d7063..00000000 --- a/oms-api/src/main/java/com/qihang/oms/domain/SysShopPullLogs.java +++ /dev/null @@ -1,245 +0,0 @@ -package com.qihang.oms.domain; - -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.util.Date; - -/** - * 更新日志表 - * @TableName sys_shop_pull_logs - */ -@TableName("s_shop_pull_logs") -public class SysShopPullLogs implements Serializable { - /** - * 主键Id - */ - private Long id; - - /** - * 店铺id - */ - private Integer shopId; - - /** - * 平台id - */ - private Integer shopType; - - /** - * 类型（ORDER订单，GOODS商品，REFUND退款） - */ - private String pullType; - - /** - * 拉取方式（主动拉取、定时任务） - */ - private String pullWay; - - /** - * 拉取参数 - */ - private String pullParams; - - /** - * 拉取结果 - */ - private String pullResult; - - /** - * 拉取时间 - */ - private Date pullTime; - - /** - * 耗时（毫秒） - */ - private Long duration; - - private static final long serialVersionUID = 1L; - - /** - * 主键Id - */ - public Long getId() { - return id; - } - - /** - * 主键Id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 店铺id - */ - public Integer getShopId() { - return shopId; - } - - /** - * 店铺id - */ - public void setShopId(Integer shopId) { - this.shopId = shopId; - } - - /** - * 平台id - */ - public Integer getShopType() { - return shopType; - } - - /** - * 平台id - */ - public void setShopType(Integer shopType) { - this.shopType = shopType; - } - - /** - * 类型（ORDER订单，GOODS商品，REFUND退款） - */ - public String getPullType() { - return pullType; - } - - /** - * 类型（ORDER订单，GOODS商品，REFUND退款） - */ - public void setPullType(String pullType) { - this.pullType = pullType; - } - - /** - * 拉取方式（主动拉取、定时任务） - */ - public String getPullWay() { - return pullWay; - } - - /** - * 拉取方式（主动拉取、定时任务） - */ - public void setPullWay(String pullWay) { - this.pullWay = pullWay; - } - - /** - * 拉取参数 - */ - public String getPullParams() { - return pullParams; - } - - /** - * 拉取参数 - */ - public void setPullParams(String pullParams) { - this.pullParams = pullParams; - } - - /** - * 拉取结果 - */ - public String getPullResult() { - return pullResult; - } - - /** - * 拉取结果 - */ - public void setPullResult(String pullResult) { - this.pullResult = pullResult; - } - - /** - * 拉取时间 - */ - public Date getPullTime() { - return pullTime; - } - - /** - * 拉取时间 - */ - public void setPullTime(Date pullTime) { - this.pullTime = pullTime; - } - - /** - * 耗时（毫秒） - */ - public Long getDuration() { - return duration; - } - - /** - * 耗时（毫秒） - */ - public void setDuration(Long duration) { - this.duration = duration; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SysShopPullLogs other = (SysShopPullLogs) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId())) - && (this.getShopType() == null ? other.getShopType() == null : this.getShopType().equals(other.getShopType())) - && (this.getPullType() == null ? other.getPullType() == null : this.getPullType().equals(other.getPullType())) - && (this.getPullWay() == null ? other.getPullWay() == null : this.getPullWay().equals(other.getPullWay())) - && (this.getPullParams() == null ? other.getPullParams() == null : this.getPullParams().equals(other.getPullParams())) - && (this.getPullResult() == null ? other.getPullResult() == null : this.getPullResult().equals(other.getPullResult())) - && (this.getPullTime() == null ? other.getPullTime() == null : this.getPullTime().equals(other.getPullTime())) - && (this.getDuration() == null ? other.getDuration() == null : this.getDuration().equals(other.getDuration())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode()); - result = prime * result + ((getShopType() == null) ? 0 : getShopType().hashCode()); - result = prime * result + ((getPullType() == null) ? 0 : getPullType().hashCode()); - result = prime * result + ((getPullWay() == null) ? 0 : getPullWay().hashCode()); - result = prime * result + ((getPullParams() == null) ? 0 : getPullParams().hashCode()); - result = prime * result + ((getPullResult() == null) ? 0 : getPullResult().hashCode()); - result = prime * result + ((getPullTime() == null) ? 0 : getPullTime().hashCode()); - result = prime * result + ((getDuration() == null) ? 0 : getDuration().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", shopId=").append(shopId); - sb.append(", shopType=").append(shopType); - sb.append(", pullType=").append(pullType); - sb.append(", pullWay=").append(pullWay); - sb.append(", pullParams=").append(pullParams); - sb.append(", pullResult=").append(pullResult); - sb.append(", pullTime=").append(pullTime); - sb.append(", duration=").append(duration); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SShopMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/SShopMapper.java deleted file mode 100644 index bca0218d..00000000 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SShopMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.qihang.oms.mapper; - -import com.qihang.oms.domain.SShop; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【s_shop(电商平台店铺表)】的数据库操作Mapper -* @createDate 2024-06-04 14:53:08 -* @Entity com.qihang.oms.domain.SShop -*/ -public interface SShopMapper extends BaseMapper { - -} - - - - diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SShopPlatformMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/SShopPlatformMapper.java deleted file mode 100644 index 94ada75f..00000000 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SShopPlatformMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.qihang.oms.mapper; - -import com.qihang.oms.domain.SShopPlatform; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【s_shop_platform(电商平台配置表)】的数据库操作Mapper -* @createDate 2024-06-04 14:53:08 -* @Entity com.qihang.oms.domain.SShopPlatform -*/ -public interface SShopPlatformMapper extends BaseMapper { - -} - - - - diff --git a/oms-api/src/main/java/com/qihang/oms/service/SShopPlatformService.java b/oms-api/src/main/java/com/qihang/oms/service/SShopPlatformService.java deleted file mode 100644 index 4047d989..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/SShopPlatformService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.qihang.oms.service; - -import com.qihang.oms.domain.SShopPlatform; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【s_shop_platform(电商平台配置表)】的数据库操作Service -* @createDate 2024-06-04 14:53:08 -*/ -public interface SShopPlatformService extends IService { - -} diff --git a/oms-api/src/main/java/com/qihang/oms/service/SShopService.java b/oms-api/src/main/java/com/qihang/oms/service/SShopService.java deleted file mode 100644 index 94904f80..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/SShopService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.qihang.oms.service; - -import com.qihang.oms.domain.SShop; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【s_shop(电商平台店铺表)】的数据库操作Service -* @createDate 2024-06-04 14:53:08 -*/ -public interface SShopService extends IService { - -} diff --git a/oms-api/src/main/java/com/qihang/oms/service/SysShopPullLogsService.java b/oms-api/src/main/java/com/qihang/oms/service/SysShopPullLogsService.java deleted file mode 100644 index a21e33e9..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/SysShopPullLogsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.qihang.oms.service; - -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.SysShopPullLogs; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Service -* @createDate 2024-03-22 17:43:38 -*/ -public interface SysShopPullLogsService extends IService { - - PageResult queryPageList(SysShopPullLogs bo, PageQuery pageQuery); -} diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SShopPlatformServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/SShopPlatformServiceImpl.java deleted file mode 100644 index b5318c62..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SShopPlatformServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.qihang.oms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.SShopPlatform; -import com.qihang.oms.service.SShopPlatformService; -import com.qihang.oms.mapper.SShopPlatformMapper; -import org.springframework.stereotype.Service; - -/** -* @author TW -* @description 针对表【s_shop_platform(电商平台配置表)】的数据库操作Service实现 -* @createDate 2024-06-04 14:53:08 -*/ -@Service -public class SShopPlatformServiceImpl extends ServiceImpl - implements SShopPlatformService{ - -} - - - - diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SShopServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/SShopServiceImpl.java deleted file mode 100644 index 8b57fde3..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SShopServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.qihang.oms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.oms.domain.SShop; -import com.qihang.oms.service.SShopService; -import com.qihang.oms.mapper.SShopMapper; -import org.springframework.stereotype.Service; - -/** -* @author TW -* @description 针对表【s_shop(电商平台店铺表)】的数据库操作Service实现 -* @createDate 2024-06-04 14:53:08 -*/ -@Service -public class SShopServiceImpl extends ServiceImpl - implements SShopService{ - -} - - - - diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SysShopPullLogsServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/SysShopPullLogsServiceImpl.java deleted file mode 100644 index 3cea3fb6..00000000 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SysShopPullLogsServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.qihang.oms.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.oms.domain.SysShopPullLogs; -import com.qihang.oms.service.SysShopPullLogsService; -import com.qihang.oms.mapper.SysShopPullLogsMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** -* @author TW -* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Service实现 -* @createDate 2024-03-22 17:43:38 -*/ -@AllArgsConstructor -@Service -public class SysShopPullLogsServiceImpl extends ServiceImpl - implements SysShopPullLogsService{ - private final SysShopPullLogsMapper mapper; - - @Override - public PageResult queryPageList(SysShopPullLogs bo, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(bo.getShopId()!=null,SysShopPullLogs::getShopId,bo.getShopId()); - queryWrapper.eq(bo.getShopType()!=null,SysShopPullLogs::getShopType,bo.getShopType()); - queryWrapper.eq(StringUtils.hasText(bo.getPullType()),SysShopPullLogs::getPullType,bo.getPullType()); - Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); - - return PageResult.build(pages); - } -} - - - - diff --git a/oms-api/src/main/resources/application.yml b/oms-api/src/main/resources/application.yml index 633eee79..a83c2275 100644 --- a/oms-api/src/main/resources/application.yml +++ b/oms-api/src/main/resources/application.yml @@ -1,14 +1,19 @@ server: port: 8083 spring: - cloud: - nacos: -# serverAddr: 127.0.0.1:8848 - discovery: - server-addr: 127.0.0.1:8848 - application: name: oms-api + cloud: + loadbalancer: + nacos: + enabled: true + nacos: + # serverAddr: 127.0.0.1:8848 + discovery: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + data: # redis 配置 redis: @@ -79,6 +84,6 @@ spring: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.qihang.oms.domain;com.qihang.security.entity; + type-aliases-package: cn.qihangerp.oms.domain;cn.qihangerp.module.domain;cn.qihangerp.security.entity; configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/oms-api/src/main/resources/mapper/ErpSaleAfterInfoMapper.xml b/oms-api/src/main/resources/mapper/ErpSaleAfterInfoMapper.xml index 4ed69a19..ca5903c9 100644 --- a/oms-api/src/main/resources/mapper/ErpSaleAfterInfoMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpSaleAfterInfoMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml b/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml index 8e27dfc4..14df5143 100644 --- a/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/ErpSaleOrderItemMapper.xml b/oms-api/src/main/resources/mapper/ErpSaleOrderItemMapper.xml index 58b7734b..3d66040a 100644 --- a/oms-api/src/main/resources/mapper/ErpSaleOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpSaleOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/ErpSaleOrderMapper.xml b/oms-api/src/main/resources/mapper/ErpSaleOrderMapper.xml index f2752876..66efda0c 100644 --- a/oms-api/src/main/resources/mapper/ErpSaleOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpSaleOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/ErpShipStockUpMapper.xml b/oms-api/src/main/resources/mapper/ErpShipStockUpMapper.xml index d30969e5..f1870997 100644 --- a/oms-api/src/main/resources/mapper/ErpShipStockUpMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpShipStockUpMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/ErpShipWaybillMapper.xml b/oms-api/src/main/resources/mapper/ErpShipWaybillMapper.xml index 237eb782..6fde84a4 100644 --- a/oms-api/src/main/resources/mapper/ErpShipWaybillMapper.xml +++ b/oms-api/src/main/resources/mapper/ErpShipWaybillMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OShopMapper.xml b/oms-api/src/main/resources/mapper/OShopMapper.xml new file mode 100644 index 00000000..1103e931 --- /dev/null +++ b/oms-api/src/main/resources/mapper/OShopMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,name,type, + url,sort,status,shop_group_id, + modify_on,remark,seller_id,region_id,manage_user_id + app_key,app_sercet,access_token, + expires_in,access_token_begin,refresh_token, + refresh_token_timeout,api_request_url + + diff --git a/oms-api/src/main/resources/mapper/SShopPlatformMapper.xml b/oms-api/src/main/resources/mapper/OShopPlatformMapper.xml similarity index 52% rename from oms-api/src/main/resources/mapper/SShopPlatformMapper.xml rename to oms-api/src/main/resources/mapper/OShopPlatformMapper.xml index d5622f7c..edcde3f5 100644 --- a/oms-api/src/main/resources/mapper/SShopPlatformMapper.xml +++ b/oms-api/src/main/resources/mapper/OShopPlatformMapper.xml @@ -2,23 +2,23 @@ - + - + + - + - - - + + - id,name,app_key, - app_secret,remark,server_url, - redirect_url,create_time,update_time + id,name,code, + app_key,app_secret,redirect_uri,region_id, + server_url,status diff --git a/oms-api/src/main/resources/mapper/OShopPullLasttimeMapper.xml b/oms-api/src/main/resources/mapper/OShopPullLasttimeMapper.xml new file mode 100644 index 00000000..5449f0c7 --- /dev/null +++ b/oms-api/src/main/resources/mapper/OShopPullLasttimeMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + id,shop_id,pull_type, + lasttime,create_time,update_time + + diff --git a/oms-api/src/main/resources/mapper/SysShopPullLogsMapper.xml b/oms-api/src/main/resources/mapper/OShopPullLogsMapper.xml similarity index 87% rename from oms-api/src/main/resources/mapper/SysShopPullLogsMapper.xml rename to oms-api/src/main/resources/mapper/OShopPullLogsMapper.xml index 1ddd8f2e..1d3d6068 100644 --- a/oms-api/src/main/resources/mapper/SysShopPullLogsMapper.xml +++ b/oms-api/src/main/resources/mapper/OShopPullLogsMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsDouGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/OmsDouGoodsSkuMapper.xml index 8f481634..5eb53338 100644 --- a/oms-api/src/main/resources/mapper/OmsDouGoodsSkuMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsDouGoodsSkuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsDouOrderItemMapper.xml b/oms-api/src/main/resources/mapper/OmsDouOrderItemMapper.xml index 8114e993..df979cf4 100644 --- a/oms-api/src/main/resources/mapper/OmsDouOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsDouOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsDouOrderMapper.xml b/oms-api/src/main/resources/mapper/OmsDouOrderMapper.xml index ecb321b0..b5cb1fdc 100644 --- a/oms-api/src/main/resources/mapper/OmsDouOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsDouOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsDouRefundMapper.xml b/oms-api/src/main/resources/mapper/OmsDouRefundMapper.xml index 7726c144..86ba1786 100644 --- a/oms-api/src/main/resources/mapper/OmsDouRefundMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsDouRefundMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsJdAfterSaleMapper.xml b/oms-api/src/main/resources/mapper/OmsJdAfterSaleMapper.xml index ee81965c..06eb3aee 100644 --- a/oms-api/src/main/resources/mapper/OmsJdAfterSaleMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsJdAfterSaleMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsJdGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/OmsJdGoodsSkuMapper.xml index 63c98e80..a7a9e633 100644 --- a/oms-api/src/main/resources/mapper/OmsJdGoodsSkuMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsJdGoodsSkuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsJdOrderItemMapper.xml b/oms-api/src/main/resources/mapper/OmsJdOrderItemMapper.xml index 9bab914c..9414f7a2 100644 --- a/oms-api/src/main/resources/mapper/OmsJdOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsJdOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsJdOrderMapper.xml b/oms-api/src/main/resources/mapper/OmsJdOrderMapper.xml index 34a11fc2..ccfef22d 100644 --- a/oms-api/src/main/resources/mapper/OmsJdOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsJdOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsPddGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/OmsPddGoodsSkuMapper.xml index 3b407ff1..73ddb682 100644 --- a/oms-api/src/main/resources/mapper/OmsPddGoodsSkuMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsPddGoodsSkuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsPddOrderItemMapper.xml b/oms-api/src/main/resources/mapper/OmsPddOrderItemMapper.xml index 8423faa3..25f5cc17 100644 --- a/oms-api/src/main/resources/mapper/OmsPddOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsPddOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsPddOrderMapper.xml b/oms-api/src/main/resources/mapper/OmsPddOrderMapper.xml index 43d28077..3c7dbeff 100644 --- a/oms-api/src/main/resources/mapper/OmsPddOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsPddOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsPddRefundMapper.xml b/oms-api/src/main/resources/mapper/OmsPddRefundMapper.xml index 309301c7..0f60b3df 100644 --- a/oms-api/src/main/resources/mapper/OmsPddRefundMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsPddRefundMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsTaoGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/OmsTaoGoodsSkuMapper.xml index 36c3d3bf..e05e2f5f 100644 --- a/oms-api/src/main/resources/mapper/OmsTaoGoodsSkuMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsTaoGoodsSkuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsTaoOrderItemMapper.xml b/oms-api/src/main/resources/mapper/OmsTaoOrderItemMapper.xml index 894d5ccf..0c8f16ab 100644 --- a/oms-api/src/main/resources/mapper/OmsTaoOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsTaoOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsTaoOrderMapper.xml b/oms-api/src/main/resources/mapper/OmsTaoOrderMapper.xml index d6c57638..45177d7f 100644 --- a/oms-api/src/main/resources/mapper/OmsTaoOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsTaoOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsTaoRefundMapper.xml b/oms-api/src/main/resources/mapper/OmsTaoRefundMapper.xml index 24b5f0f1..ae899144 100644 --- a/oms-api/src/main/resources/mapper/OmsTaoRefundMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsTaoRefundMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsWeiGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/OmsWeiGoodsSkuMapper.xml index 54329c5c..b9a24283 100644 --- a/oms-api/src/main/resources/mapper/OmsWeiGoodsSkuMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsWeiGoodsSkuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsWeiOrderItemMapper.xml b/oms-api/src/main/resources/mapper/OmsWeiOrderItemMapper.xml index 0fb02f96..06a32f9d 100644 --- a/oms-api/src/main/resources/mapper/OmsWeiOrderItemMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsWeiOrderItemMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsWeiOrderMapper.xml b/oms-api/src/main/resources/mapper/OmsWeiOrderMapper.xml index b2093b74..f7ed6a3e 100644 --- a/oms-api/src/main/resources/mapper/OmsWeiOrderMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsWeiOrderMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/OmsWeiRefundMapper.xml b/oms-api/src/main/resources/mapper/OmsWeiRefundMapper.xml index 7af62cee..05496e87 100644 --- a/oms-api/src/main/resources/mapper/OmsWeiRefundMapper.xml +++ b/oms-api/src/main/resources/mapper/OmsWeiRefundMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/SShopMapper.xml b/oms-api/src/main/resources/mapper/SShopMapper.xml deleted file mode 100644 index f2c5c5c0..00000000 --- a/oms-api/src/main/resources/mapper/SShopMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,name,nick_name, - ename,company,platform, - shop_url,order_num,is_delete, - remark,seller_shop_id,app_key, - app_sercet,access_token,access_expires_in, - access_token_begin,refresh_token,refresh_token_timeout, - create_time,update_time - - diff --git a/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml b/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml index 0dfeda0f..ae41076c 100644 --- a/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml +++ b/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/oms-api/src/main/resources/mapper/SysUserMapper.xml b/oms-api/src/main/resources/mapper/SysUserMapper.xml index 2b6c181f..e6d6baa2 100644 --- a/oms-api/src/main/resources/mapper/SysUserMapper.xml +++ b/oms-api/src/main/resources/mapper/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/open-api/src/main/java/cn/qihangerp/open/OpenApi.java b/open-api/src/main/java/cn/qihangerp/open/OpenApi.java index 7e0542ed..97b693b5 100644 --- a/open-api/src/main/java/cn/qihangerp/open/OpenApi.java +++ b/open-api/src/main/java/cn/qihangerp/open/OpenApi.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; //@EnableDiscoveryClient //@MapperScan("com.qihang.oms.mapper") -@ComponentScan(basePackages={"cn.qihangerp.open","com.qihang"}) +@ComponentScan(basePackages={"cn.qihangerp.open","cn.qihangerp"}) @SpringBootApplication public class OpenApi { public static void main( String[] args ) diff --git a/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java b/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java index 6647260c..c434b8d8 100644 --- a/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java +++ b/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; @Configuration //@MapperScan("com.qihang.tao.mapper") -@MapperScan(basePackages ={"cn.qihangerp.open.*.mapper","cn.qihangerp.*.mapper"}) +@MapperScan(basePackages ={"cn.qihangerp.open.*.mapper","cn.qihangerp.open.mapper"}) public class MybatisPlusConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouApiHelper.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouApiHelper.java index 5243ee50..0a05e3c0 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouApiHelper.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouApiHelper.java @@ -3,9 +3,9 @@ package cn.qihangerp.open.dou.controller; import cn.qihangerp.open.dou.common.ApiResultVo; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; -import com.qihang.common.api.ShopApiParams; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.api.ShopApiParams; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; import lombok.AllArgsConstructor; import lombok.extern.java.Log; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java index 5c64173a..6a7533d0 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java @@ -10,9 +10,9 @@ import cn.qihangerp.open.dou.domain.OmsDouGoodsSku; import cn.qihangerp.open.dou.model.GoodsListResultVo; import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.service.OmsDouGoodsService; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java index f0387b22..0444b203 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java @@ -5,13 +5,13 @@ import cn.qihangerp.open.dou.domain.OmsDouGoods; import cn.qihangerp.open.dou.domain.OmsDouGoodsSku; import cn.qihangerp.open.dou.service.OmsDouGoodsService; import cn.qihangerp.open.dou.service.OmsDouGoodsSkuService; -import com.qihang.common.bo.LinkErpGoodsSkuBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; +import cn.qihangerp.common.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java index 6972507a..46210bc1 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java @@ -14,12 +14,12 @@ import cn.qihangerp.open.dou.service.OmsDouOrderService; import cn.qihangerp.open.service.SysShopPullLasttimeService; import cn.qihangerp.open.service.SysShopPullLogsService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java index 1dc093bf..f5d423e1 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.dou.domain.bo.DouOrderBo; import cn.qihangerp.open.dou.domain.bo.DouOrderPushBo; import cn.qihangerp.open.dou.service.OmsDouOrderService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java index a4271e8f..4fa6fd3e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java @@ -10,12 +10,12 @@ import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.after.AfterSale; import cn.qihangerp.open.dou.service.OmsDouRefundService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java index a52b0d14..65c7ad6c 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java @@ -6,15 +6,15 @@ import cn.qihangerp.open.dou.domain.bo.DouOrderPushBo; import cn.qihangerp.open.dou.domain.bo.DouRefundBo; import cn.qihangerp.open.dou.service.OmsDouRefundService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouWaybillController.java b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouWaybillController.java index 653a88cb..6f21caaf 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouWaybillController.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouWaybillController.java @@ -19,10 +19,10 @@ import cn.qihangerp.open.dou.service.OmsDouOrderService; import cn.qihangerp.open.dou.service.OmsDouWaybillAccountService; import cn.qihangerp.open.service.ErpShipWaybillService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.util.StringUtils; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsService.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsService.java index 7cbeeaa9..7c778bd2 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsService.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsService.java @@ -1,8 +1,8 @@ package cn.qihangerp.open.dou.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.dou.domain.OmsDouGoods; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsSkuService.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsSkuService.java index f96554b8..e7ab8e55 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsSkuService.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouGoodsSkuService.java @@ -1,8 +1,8 @@ package cn.qihangerp.open.dou.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.dou.domain.OmsDouGoodsSku; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouOrderService.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouOrderService.java index a29232a6..07c7f28f 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouOrderService.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouOrderService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.dou.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.dou.domain.OmsDouOrder; import cn.qihangerp.open.dou.domain.bo.DouOrderBo; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouRefundService.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouRefundService.java index bacfb221..0553fe5e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouRefundService.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/OmsDouRefundService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.dou.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.dou.domain.OmsDouRefund; import cn.qihangerp.open.dou.domain.bo.DouRefundBo; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsServiceImpl.java index bd17117c..029f570e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsServiceImpl.java @@ -3,9 +3,9 @@ package cn.qihangerp.open.dou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.dou.domain.OmsDouGoods; import cn.qihangerp.open.dou.domain.OmsDouGoodsSku; import cn.qihangerp.open.dou.mapper.OmsDouGoodsMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsSkuServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsSkuServiceImpl.java index 0d45e029..2bb1ed5d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsSkuServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouGoodsSkuServiceImpl.java @@ -3,8 +3,8 @@ package cn.qihangerp.open.dou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.dou.domain.OmsDouGoodsSku; import cn.qihangerp.open.dou.mapper.OmsDouGoodsSkuMapper; import cn.qihangerp.open.dou.service.OmsDouGoodsSkuService; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouOrderServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouOrderServiceImpl.java index 93351010..206d2c77 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouOrderServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouOrderServiceImpl.java @@ -3,11 +3,11 @@ package cn.qihangerp.open.dou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.utils.DateUtils; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.open.dou.domain.OmsDouOrder; import cn.qihangerp.open.dou.domain.OmsDouOrderItem; import cn.qihangerp.open.dou.domain.bo.DouOrderBo; diff --git a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouRefundServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouRefundServiceImpl.java index 17a21ac6..064cd898 100644 --- a/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouRefundServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/dou/service/impl/OmsDouRefundServiceImpl.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.dou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.dou.domain.OmsDouRefund; import cn.qihangerp.open.dou.domain.bo.DouRefundBo; import cn.qihangerp.open.dou.mapper.OmsDouRefundMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java b/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java index 72abb646..b662322e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.jd; import cn.qihangerp.open.domain.SShopPlatform; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; -import com.qihang.common.api.ShopApiParams; -import com.qihang.common.common.ResultVo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.api.ShopApiParams; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleApiController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleApiController.java index 17a909ba..a9c64424 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleApiController.java @@ -13,14 +13,14 @@ import cn.qihangerp.open.jd.service.OmsJdAfterSaleService; import cn.qihangerp.open.service.SysShopPullLasttimeService; import cn.qihangerp.open.service.SysShopPullLogsService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.common.utils.DateUtils; +import cn.qihangerp.common.utils.DateUtils; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.kafka.core.KafkaTemplate; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleController.java index 9055a8d2..4d3caf04 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdAfterSaleController.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.jd.domain.bo.JdAfterBo; import cn.qihangerp.open.jd.domain.bo.JdOrderPushBo; import cn.qihangerp.open.jd.service.OmsJdAfterSaleService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java index 79e5e499..ac55eae9 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java @@ -10,10 +10,10 @@ import cn.qihangerp.open.jd.model.GoodsSku; import cn.qihangerp.open.jd.service.OmsJdGoodsSkuService; import cn.qihangerp.open.jd.utils.DateUtil; import com.alibaba.fastjson2.JSON; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java index baacb2e2..e8be5548 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java @@ -3,13 +3,13 @@ package cn.qihangerp.open.jd.controller; import cn.qihangerp.open.jd.domain.OmsJdGoodsSku; import cn.qihangerp.open.jd.service.OmsJdGoodsSkuService; -import com.qihang.common.bo.LinkErpGoodsSkuBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; +import cn.qihangerp.common.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java index c6c4b402..a250f33a 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java @@ -4,8 +4,8 @@ import cn.qihangerp.open.domain.SShopPlatform; import cn.qihangerp.open.jd.domain.bo.JdTokenCreateBo; import cn.qihangerp.open.service.SShopPlatformService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.EnumShopType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java index 2b208815..2831d6f6 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java @@ -13,12 +13,12 @@ import cn.qihangerp.open.jd.service.OmsJdOrderService; import cn.qihangerp.open.service.SysShopPullLasttimeService; import cn.qihangerp.open.service.SysShopPullLogsService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.kafka.core.KafkaTemplate; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java index faf4d666..8b9b68cd 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.jd.domain.bo.JdOrderBo; import cn.qihangerp.open.jd.domain.bo.JdOrderPushBo; import cn.qihangerp.open.jd.service.OmsJdOrderService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdWaybillController.java b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdWaybillController.java index b8541de8..00fd10ba 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdWaybillController.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdWaybillController.java @@ -22,10 +22,10 @@ import cn.qihangerp.open.jd.service.OmsJdOrderService; import cn.qihangerp.open.jd.service.OmsJdWaybillAccountService; import cn.qihangerp.open.service.ErpShipWaybillService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.kafka.core.KafkaTemplate; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdAfterSaleService.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdAfterSaleService.java index 55f4844f..81573740 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdAfterSaleService.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdAfterSaleService.java @@ -3,9 +3,9 @@ package cn.qihangerp.open.jd.service; import cn.qihangerp.open.jd.domain.OmsJdAfterSale; import cn.qihangerp.open.jd.domain.bo.JdAfterBo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdGoodsSkuService.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdGoodsSkuService.java index 6d601149..8f0ec9f9 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdGoodsSkuService.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdGoodsSkuService.java @@ -2,9 +2,9 @@ package cn.qihangerp.open.jd.service; import cn.qihangerp.open.jd.domain.OmsJdGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdOrderService.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdOrderService.java index 11cf4ed0..5f07fe77 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdOrderService.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/OmsJdOrderService.java @@ -3,9 +3,9 @@ package cn.qihangerp.open.jd.service; import cn.qihangerp.open.jd.domain.OmsJdOrder; import cn.qihangerp.open.jd.domain.bo.JdOrderBo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdAfterSaleServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdAfterSaleServiceImpl.java index d13ae024..fa5238ed 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdAfterSaleServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdAfterSaleServiceImpl.java @@ -11,10 +11,10 @@ import cn.qihangerp.open.jd.service.OmsJdAfterSaleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdGoodsSkuServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdGoodsSkuServiceImpl.java index 1dda6c3a..6b3d639d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdGoodsSkuServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdGoodsSkuServiceImpl.java @@ -6,9 +6,9 @@ import cn.qihangerp.open.jd.service.OmsJdGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdOrderServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdOrderServiceImpl.java index 94ef73b5..990360c5 100644 --- a/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdOrderServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/jd/service/impl/OmsJdOrderServiceImpl.java @@ -10,10 +10,10 @@ import cn.qihangerp.open.jd.service.OmsJdOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java b/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java index 92d5321c..04cad0fd 100644 --- a/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java +++ b/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java @@ -5,7 +5,7 @@ import cn.qihangerp.open.service.SShopService; import com.kuaishou.merchant.open.api.KsMerchantApiException; import com.kuaishou.merchant.open.api.client.oauth.OauthAccessTokenKsClient; import com.kuaishou.merchant.open.api.response.KsAccessTokenResponse; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.enums.EnumShopType; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; diff --git a/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java index 69b6403a..c7b0b15f 100644 --- a/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java @@ -9,10 +9,10 @@ import com.kuaishou.merchant.open.api.KsMerchantApiException; import com.kuaishou.merchant.open.api.client.AccessTokenKsMerchantClient; import com.kuaishou.merchant.open.api.request.KsMerchantOrderListRequest; import com.kuaishou.merchant.open.api.response.KsMerchantOrderListResponse; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/open-api/src/main/java/cn/qihangerp/open/mapper/SysUserMapper.java b/open-api/src/main/java/cn/qihangerp/open/mapper/SysUserMapper.java index 54ed0736..8a0cd90c 100644 --- a/open-api/src/main/java/cn/qihangerp/open/mapper/SysUserMapper.java +++ b/open-api/src/main/java/cn/qihangerp/open/mapper/SysUserMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.open.mapper; -import com.qihang.security.entity.SysUser; +import cn.qihangerp.security.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/PddApiCommon.java b/open-api/src/main/java/cn/qihangerp/open/pdd/PddApiCommon.java index 2cb040dc..d4f63048 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/PddApiCommon.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/PddApiCommon.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.pdd; import cn.qihangerp.open.domain.SShopPlatform; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; -import com.qihang.common.api.ShopApiParams; -import com.qihang.common.common.ResultVo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.api.ShopApiParams; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java index f51a803f..4286e43a 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java @@ -2,7 +2,6 @@ package cn.qihangerp.open.pdd.controller; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.pdd.PddApiCommon; -import cn.qihangerp.open.pdd.GoodsApiHelper; import cn.qihangerp.open.pdd.PddGoodsApiHelper; import cn.qihangerp.open.pdd.PddPullRequest; @@ -11,11 +10,11 @@ import cn.qihangerp.open.pdd.domain.OmsPddGoodsSku; import cn.qihangerp.open.pdd.model.GoodsResultVo; import cn.qihangerp.open.pdd.service.OmsPddGoodsService; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.beans.BeanUtils; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java index 762291b4..80394848 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java @@ -5,13 +5,13 @@ import cn.qihangerp.open.pdd.domain.OmsPddGoods; import cn.qihangerp.open.pdd.domain.OmsPddGoodsSku; import cn.qihangerp.open.pdd.service.OmsPddGoodsService; import cn.qihangerp.open.pdd.service.OmsPddGoodsSkuService; -import com.qihang.common.bo.LinkErpGoodsSkuBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; +import cn.qihangerp.common.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java index 24a17c13..f1396f4d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java @@ -6,8 +6,8 @@ import cn.qihangerp.open.pdd.domain.bo.TokenCreateBo; import cn.qihangerp.open.pdd.model.Token; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.EnumShopType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java index f0378b0f..3fbc30f2 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java @@ -14,12 +14,12 @@ import cn.qihangerp.open.pdd.service.OmsPddOrderService; import cn.qihangerp.open.service.SysShopPullLasttimeService; import cn.qihangerp.open.service.SysShopPullLogsService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java index fae29534..dba96a7d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.pdd.domain.OmsPddOrder; import cn.qihangerp.open.pdd.domain.bo.PddOrderPushBo; import cn.qihangerp.open.pdd.service.OmsPddOrderService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java index b634a616..29c69220 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java @@ -9,8 +9,8 @@ import cn.qihangerp.open.pdd.domain.OmsPddOrder; import cn.qihangerp.open.pdd.model.AfterSale; import cn.qihangerp.open.pdd.service.OmsPddGoodsService; import cn.qihangerp.open.pdd.service.OmsPddOrderService; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java index cac125d6..1ea4914f 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.pdd.domain.bo.PddAfterSaleBo; import cn.qihangerp.open.pdd.domain.bo.PddOrderPushBo; import cn.qihangerp.open.pdd.service.OmsPddRefundService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddWaybillController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddWaybillController.java index 4a4a6c51..b3231543 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddWaybillController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddWaybillController.java @@ -17,10 +17,10 @@ import cn.qihangerp.open.pdd.service.OmsPddOrderService; import cn.qihangerp.open.pdd.service.OmsPddWaybillAccountService; import cn.qihangerp.open.service.ErpShipWaybillService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.util.StringUtils; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsService.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsService.java index d9706ff0..f99b7305 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsService.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsService.java @@ -1,8 +1,8 @@ package cn.qihangerp.open.pdd.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.pdd.domain.OmsPddGoods; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsSkuService.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsSkuService.java index 508f6c72..c5275190 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsSkuService.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddGoodsSkuService.java @@ -1,8 +1,8 @@ package cn.qihangerp.open.pdd.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.pdd.domain.OmsPddGoodsSku; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddOrderService.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddOrderService.java index 6643ebe9..0224b0bd 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddOrderService.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddOrderService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.pdd.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.pdd.domain.OmsPddOrder; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddRefundService.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddRefundService.java index 23c26261..558f7fc3 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddRefundService.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/OmsPddRefundService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.pdd.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.pdd.domain.OmsPddRefund; import cn.qihangerp.open.pdd.domain.bo.PddAfterSaleBo; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsServiceImpl.java index 0d13275d..1febe6ba 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsServiceImpl.java @@ -3,9 +3,9 @@ package cn.qihangerp.open.pdd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.pdd.domain.OmsPddGoods; import cn.qihangerp.open.pdd.domain.OmsPddGoodsSku; import cn.qihangerp.open.pdd.mapper.OmsPddGoodsMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsSkuServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsSkuServiceImpl.java index 7a141f63..145ae53c 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsSkuServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddGoodsSkuServiceImpl.java @@ -3,8 +3,8 @@ package cn.qihangerp.open.pdd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.pdd.domain.OmsPddGoodsSku; import cn.qihangerp.open.pdd.mapper.OmsPddGoodsSkuMapper; import cn.qihangerp.open.pdd.service.OmsPddGoodsSkuService; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddOrderServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddOrderServiceImpl.java index ac389774..af2b6313 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddOrderServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddOrderServiceImpl.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.pdd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.pdd.domain.OmsPddOrder; import cn.qihangerp.open.pdd.domain.OmsPddOrderItem; import cn.qihangerp.open.pdd.mapper.OmsPddOrderItemMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddRefundServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddRefundServiceImpl.java index 574b1b34..cef4e11d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddRefundServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/service/impl/OmsPddRefundServiceImpl.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.pdd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.pdd.domain.OmsPddRefund; import cn.qihangerp.open.pdd.domain.bo.PddAfterSaleBo; import cn.qihangerp.open.pdd.mapper.OmsPddOrderItemMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/service/ErpShipWaybillService.java b/open-api/src/main/java/cn/qihangerp/open/service/ErpShipWaybillService.java index 75638c07..b8d262f8 100644 --- a/open-api/src/main/java/cn/qihangerp/open/service/ErpShipWaybillService.java +++ b/open-api/src/main/java/cn/qihangerp/open/service/ErpShipWaybillService.java @@ -2,7 +2,7 @@ package cn.qihangerp.open.service; import cn.qihangerp.open.domain.ErpShipWaybill; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.ResultVo; import java.util.List; diff --git a/open-api/src/main/java/cn/qihangerp/open/service/impl/ErpShipWaybillServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/service/impl/ErpShipWaybillServiceImpl.java index 01c36230..00b81627 100644 --- a/open-api/src/main/java/cn/qihangerp/open/service/impl/ErpShipWaybillServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/service/impl/ErpShipWaybillServiceImpl.java @@ -8,10 +8,10 @@ import cn.qihangerp.open.tao.mapper.OmsTaoOrderMapper; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.ResultVo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; diff --git a/open-api/src/main/java/cn/qihangerp/open/service/impl/SysUserServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/service/impl/SysUserServiceImpl.java index 896f6cca..8242f8c1 100644 --- a/open-api/src/main/java/cn/qihangerp/open/service/impl/SysUserServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/service/impl/SysUserServiceImpl.java @@ -1,11 +1,11 @@ package cn.qihangerp.open.service.impl; import cn.qihangerp.open.mapper.SysUserMapper; -import com.qihang.common.common.ServiceException; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.ISysUserService; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java b/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java index 6c3513e8..052bc25d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java @@ -2,10 +2,10 @@ package cn.qihangerp.open.tao; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; -import com.qihang.common.api.ShopApiParams; -import com.qihang.common.common.ResultVo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.api.ShopApiParams; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java index 90dc900c..23f4042a 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java @@ -3,24 +3,21 @@ package cn.qihangerp.open.tao.controller; import cn.qihangerp.open.domain.SysShopPullLogs; import cn.qihangerp.open.service.SysShopPullLogsService; import cn.qihangerp.open.tao.TaoApiCommon; -import cn.qihangerp.open.tao.GoodsApiHelper; import cn.qihangerp.open.tao.TaoGoodsApiHelper; import cn.qihangerp.open.tao.TaoRequest; -import cn.qihangerp.open.tao.common.ApiResultVo; import cn.qihangerp.open.tao.common.ApiResultVoEnum; import cn.qihangerp.open.tao.domain.OmsTaoGoods; import cn.qihangerp.open.tao.domain.OmsTaoGoodsSku; -import cn.qihangerp.open.tao.model.GoodsItem; import cn.qihangerp.open.tao.response.TaoGoodsResponse; import cn.qihangerp.open.tao.service.OmsTaoGoodsService; import cn.qihangerp.open.tao.utils.DateUtil; -import com.qihang.common.api.ShopApiParams; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.api.ShopApiParams; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java index 7f671def..6ead02fc 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java @@ -6,13 +6,13 @@ import cn.qihangerp.open.tao.domain.OmsTaoGoodsSku; import cn.qihangerp.open.tao.domain.vo.TaoGoodsSkuListVo; import cn.qihangerp.open.tao.service.OmsTaoGoodsService; import cn.qihangerp.open.tao.service.OmsTaoGoodsSkuService; -import com.qihang.common.bo.LinkErpGoodsSkuBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; +import cn.qihangerp.common.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java index abefa18e..8516f702 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java @@ -3,8 +3,8 @@ package cn.qihangerp.open.tao.controller; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.tao.domain.bo.TaoTokenCreateBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.EnumShopType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.EnumShopType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java index cb046be2..3a6c528a 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java @@ -10,18 +10,16 @@ import cn.qihangerp.open.tao.TaoApiCommon; import cn.qihangerp.open.tao.TaoOrderApiHelper; import cn.qihangerp.open.tao.TaoRequest; import cn.qihangerp.open.tao.domain.OmsTaoOrder; -import cn.qihangerp.open.tao.model.TradeDetail1; -import cn.qihangerp.open.tao.model.TradeList; import cn.qihangerp.open.tao.response.TaoOrderDetailResponse; import cn.qihangerp.open.tao.response.TaoOrderListResponse; import cn.qihangerp.open.tao.service.OmsTaoOrderService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderContoller.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderContoller.java index 66a3da16..32e36f8d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderContoller.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderContoller.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.tao.domain.bo.TaoOrderBo; import cn.qihangerp.open.tao.domain.bo.TaoOrderPushBo; import cn.qihangerp.open.tao.service.OmsTaoOrderService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java index 328508d2..2959c82d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java @@ -6,21 +6,19 @@ import cn.qihangerp.open.domain.SysShopPullLogs; import cn.qihangerp.open.service.SysShopPullLasttimeService; import cn.qihangerp.open.service.SysShopPullLogsService; import cn.qihangerp.open.tao.TaoApiCommon; -import cn.qihangerp.open.tao.RefundApiHelper; import cn.qihangerp.open.tao.TaoRefundApiHelper; import cn.qihangerp.open.tao.TaoRequest; import cn.qihangerp.open.tao.domain.OmsTaoRefund; -import cn.qihangerp.open.tao.model.Refund; import cn.qihangerp.open.tao.response.TaoRefundResponse; import cn.qihangerp.open.tao.service.OmsTaoRefundService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundContoller.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundContoller.java index 02baadb8..d394e827 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundContoller.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundContoller.java @@ -5,15 +5,15 @@ import cn.qihangerp.open.tao.domain.bo.TaoOrderPushBo; import cn.qihangerp.open.tao.domain.bo.TaoRefundBo; import cn.qihangerp.open.tao.service.OmsTaoRefundService; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.*; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoWaybillController.java b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoWaybillController.java index 463820ad..a522d7ba 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoWaybillController.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoWaybillController.java @@ -18,9 +18,9 @@ import cn.qihangerp.open.tao.request.WaybillCloudPrintApplyNewRequestTradeOrderI import cn.qihangerp.open.tao.service.OmsTaoOrderService; import cn.qihangerp.open.tao.service.OmsTaoWaybillAccountService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.kafka.core.KafkaTemplate; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsService.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsService.java index ed7767e3..2e9eb8a9 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsService.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsService.java @@ -2,8 +2,8 @@ package cn.qihangerp.open.tao.service; import cn.qihangerp.open.tao.domain.OmsTaoGoods; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsSkuService.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsSkuService.java index e1431cf3..c6de9b6d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsSkuService.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoGoodsSkuService.java @@ -4,8 +4,8 @@ import cn.qihangerp.open.tao.domain.OmsTaoGoods; import cn.qihangerp.open.tao.domain.OmsTaoGoodsSku; import cn.qihangerp.open.tao.domain.vo.TaoGoodsSkuListVo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoOrderService.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoOrderService.java index 542f4ea1..bfb2e9e8 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoOrderService.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoOrderService.java @@ -4,9 +4,9 @@ package cn.qihangerp.open.tao.service; import cn.qihangerp.open.tao.domain.OmsTaoOrder; import cn.qihangerp.open.tao.domain.bo.TaoOrderBo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoRefundService.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoRefundService.java index 4b720cf5..ab3bbfaa 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoRefundService.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/OmsTaoRefundService.java @@ -4,9 +4,9 @@ package cn.qihangerp.open.tao.service; import cn.qihangerp.open.tao.domain.OmsTaoRefund; import cn.qihangerp.open.tao.domain.bo.TaoRefundBo; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsServiceImpl.java index e1ff9f86..d2e5759e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsServiceImpl.java @@ -9,9 +9,9 @@ import cn.qihangerp.open.tao.service.OmsTaoGoodsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVoEnum; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsSkuServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsSkuServiceImpl.java index 46923197..c890be9d 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsSkuServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoGoodsSkuServiceImpl.java @@ -7,8 +7,8 @@ import cn.qihangerp.open.tao.mapper.OmsTaoGoodsSkuMapper; import cn.qihangerp.open.tao.service.OmsTaoGoodsSkuService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoOrderServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoOrderServiceImpl.java index 2955fb65..ac398bf1 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoOrderServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoOrderServiceImpl.java @@ -11,10 +11,10 @@ import cn.qihangerp.open.tao.service.OmsTaoOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoRefundServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoRefundServiceImpl.java index 3495dfd0..4587ecaf 100644 --- a/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoRefundServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/tao/service/impl/OmsTaoRefundServiceImpl.java @@ -9,9 +9,9 @@ import cn.qihangerp.open.tao.service.OmsTaoRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import lombok.AllArgsConstructor; import lombok.extern.java.Log; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiApiCommon.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiApiCommon.java index a5c290f5..09af155e 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiApiCommon.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiApiCommon.java @@ -7,9 +7,9 @@ import cn.qihangerp.open.wei.TokenApiHelper; import cn.qihangerp.open.wei.common.ApiResultVo; import cn.qihangerp.open.wei.vo.ShopApiParams; import cn.qihangerp.open.wei.vo.Token; -import com.qihang.common.common.ResultVo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsApiController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsApiController.java index dd626589..3aebbc34 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsApiController.java @@ -11,9 +11,9 @@ import cn.qihangerp.open.wei.service.OmsWeiGoodsService; import cn.qihangerp.open.wei.vo.GoodsDetailVo; import cn.qihangerp.open.wei.vo.GoodsListVo; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsController.java index 2500c19b..b3477dbc 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiGoodsController.java @@ -1,12 +1,12 @@ package cn.qihangerp.open.wei.controller; -import com.qihang.common.bo.LinkErpGoodsSkuBo; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.security.common.BaseController; import cn.qihangerp.open.wei.domain.OmsWeiGoodsSku; import cn.qihangerp.open.wei.service.OmsWeiGoodsSkuService; import lombok.AllArgsConstructor; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java index 57df85c4..11e1fcf1 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java @@ -6,10 +6,10 @@ import cn.qihangerp.open.wei.common.ApiResultVo; import cn.qihangerp.open.wei.model.Order; import cn.qihangerp.open.wei.model.OrderDetailDeliverInfoAddress; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.security.common.BaseController; import cn.qihangerp.open.wei.domain.OmsWeiOrder; import cn.qihangerp.open.wei.domain.OmsWeiOrderItem; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderController.java index 70148bd0..4a2352ae 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderController.java @@ -1,14 +1,14 @@ package cn.qihangerp.open.wei.controller; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; +import cn.qihangerp.security.common.BaseController; import cn.qihangerp.open.wei.bo.WeiOrderPushBo; import cn.qihangerp.open.wei.domain.OmsWeiOrder; import cn.qihangerp.open.wei.service.OmsWeiOrderService; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundApiController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundApiController.java index 9c198d26..1e8d6401 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundApiController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundApiController.java @@ -6,13 +6,13 @@ import cn.qihangerp.open.wei.RefundApiHelper; import cn.qihangerp.open.wei.common.ApiResultVo; import cn.qihangerp.open.wei.model.AfterSaleOrder; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; +import cn.qihangerp.security.common.BaseController; import cn.qihangerp.open.wei.domain.OmsWeiRefund; import cn.qihangerp.open.wei.service.OmsWeiRefundService; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundController.java index 62f64340..cbdd78f9 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiRefundController.java @@ -3,14 +3,14 @@ package cn.qihangerp.open.wei.controller; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.EnumShopType; -import com.qihang.common.mq.MqMessage; -import com.qihang.common.mq.MqType; -import com.qihang.security.common.BaseController; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.EnumShopType; +import cn.qihangerp.common.mq.MqMessage; +import cn.qihangerp.common.mq.MqType; +import cn.qihangerp.security.common.BaseController; import cn.qihangerp.open.wei.bo.WeiOrderPushBo; import cn.qihangerp.open.wei.domain.OmsWeiRefund; import cn.qihangerp.open.wei.service.OmsWeiRefundService; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiWayBillController.java b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiWayBillController.java index a7342c36..a3277d19 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiWayBillController.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiWayBillController.java @@ -14,9 +14,9 @@ import cn.qihangerp.open.wei.vo.ewaybill.AccountVo; import cn.qihangerp.open.wei.vo.ewaybill.EwaybillOrderCreateVo; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.ResultVoEnum; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.open.wei.bo.WeiWaybillGetBo; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiGoodsSkuService.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiGoodsSkuService.java index 78335392..5078b387 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiGoodsSkuService.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiGoodsSkuService.java @@ -1,8 +1,8 @@ package cn.qihangerp.open.wei.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.wei.domain.OmsWeiGoodsSku; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiOrderService.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiOrderService.java index fdda3a3a..c108375b 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiOrderService.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiOrderService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.wei.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.wei.domain.OmsWeiOrder; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiRefundService.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiRefundService.java index 8ca21a17..03b09927 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiRefundService.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/OmsWeiRefundService.java @@ -1,9 +1,9 @@ package cn.qihangerp.open.wei.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; import cn.qihangerp.open.wei.domain.OmsWeiRefund; /** diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsServiceImpl.java index e2e38953..1c0d62aa 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.open.wei.domain.OmsWeiGoods; import cn.qihangerp.open.wei.mapper.OmsWeiGoodsMapper; import cn.qihangerp.open.wei.service.OmsWeiGoodsService; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.ResultVoEnum; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsSkuServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsSkuServiceImpl.java index cf2a26fd..8c02cff2 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsSkuServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiGoodsSkuServiceImpl.java @@ -3,8 +3,8 @@ package cn.qihangerp.open.wei.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.open.wei.domain.OmsWeiGoodsSku; import cn.qihangerp.open.wei.mapper.OmsWeiGoodsSkuMapper; import cn.qihangerp.open.wei.service.OmsWeiGoodsSkuService; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiOrderServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiOrderServiceImpl.java index e48eba99..c2ee7466 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiOrderServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiOrderServiceImpl.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.wei.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.wei.domain.OmsWeiOrder; import cn.qihangerp.open.wei.domain.OmsWeiOrderItem; import cn.qihangerp.open.wei.mapper.OmsWeiGoodsSkuMapper; diff --git a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiRefundServiceImpl.java b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiRefundServiceImpl.java index dd7d057b..1c1ff2b7 100644 --- a/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiRefundServiceImpl.java +++ b/open-api/src/main/java/cn/qihangerp/open/wei/service/impl/OmsWeiRefundServiceImpl.java @@ -3,10 +3,10 @@ package cn.qihangerp.open.wei.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.ResultVo; -import com.qihang.common.common.ResultVoEnum; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.open.wei.domain.OmsWeiRefund; import cn.qihangerp.open.wei.mapper.OmsWeiOrderItemMapper; import cn.qihangerp.open.wei.mapper.OmsWeiRefundMapper; diff --git a/open-api/src/main/resources/application.yml b/open-api/src/main/resources/application.yml index d4500b9c..d3286182 100644 --- a/open-api/src/main/resources/application.yml +++ b/open-api/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: # serverAddr: 127.0.0.1:8848 discovery: server-addr: 127.0.0.1:8848 + username: nacos + password: nacos data: # redis 配置 redis: @@ -78,6 +80,6 @@ spring: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: cn.qihangerp.open.tao.domain;cn.qihangerp.open.domain;com.qihang.security.entity; + type-aliases-package: cn.qihangerp.open.domain;cn.qihangerp.security.entity; configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8bb5fa9d..1f2ddb34 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ security oms-api open-api + goods diff --git a/security/src/main/java/com/qihang/security/App.java b/security/src/main/java/cn/qihangerp/security/App.java similarity index 80% rename from security/src/main/java/com/qihang/security/App.java rename to security/src/main/java/cn/qihangerp/security/App.java index 1cf8ed4b..ca30dd82 100644 --- a/security/src/main/java/com/qihang/security/App.java +++ b/security/src/main/java/cn/qihangerp/security/App.java @@ -1,4 +1,4 @@ -package com.qihang.security; +package cn.qihangerp.security; public class App { public static void main( String[] args ) diff --git a/security/src/main/java/com/qihang/security/AuthenticationContextHolder.java b/security/src/main/java/cn/qihangerp/security/AuthenticationContextHolder.java similarity index 94% rename from security/src/main/java/com/qihang/security/AuthenticationContextHolder.java rename to security/src/main/java/cn/qihangerp/security/AuthenticationContextHolder.java index 41adba4c..21227c78 100644 --- a/security/src/main/java/com/qihang/security/AuthenticationContextHolder.java +++ b/security/src/main/java/cn/qihangerp/security/AuthenticationContextHolder.java @@ -1,4 +1,4 @@ -package com.qihang.security; +package cn.qihangerp.security; import org.springframework.security.core.Authentication; diff --git a/security/src/main/java/com/qihang/security/AuthenticationExceptionHandler.java b/security/src/main/java/cn/qihangerp/security/AuthenticationExceptionHandler.java similarity index 92% rename from security/src/main/java/com/qihang/security/AuthenticationExceptionHandler.java rename to security/src/main/java/cn/qihangerp/security/AuthenticationExceptionHandler.java index 0934f9ae..d1850cfc 100644 --- a/security/src/main/java/com/qihang/security/AuthenticationExceptionHandler.java +++ b/security/src/main/java/cn/qihangerp/security/AuthenticationExceptionHandler.java @@ -1,9 +1,9 @@ -package com.qihang.security; +package cn.qihangerp.security; import com.alibaba.fastjson2.JSON; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/security/src/main/java/com/qihang/security/JwtAuthenticationTokenFilter.java b/security/src/main/java/cn/qihangerp/security/JwtAuthenticationTokenFilter.java similarity index 96% rename from security/src/main/java/com/qihang/security/JwtAuthenticationTokenFilter.java rename to security/src/main/java/cn/qihangerp/security/JwtAuthenticationTokenFilter.java index 63f019e7..402db22d 100644 --- a/security/src/main/java/com/qihang/security/JwtAuthenticationTokenFilter.java +++ b/security/src/main/java/cn/qihangerp/security/JwtAuthenticationTokenFilter.java @@ -1,9 +1,9 @@ -package com.qihang.security; +package cn.qihangerp.security; import com.alibaba.fastjson2.JSON; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.enums.HttpStatus; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.enums.HttpStatus; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/security/src/main/java/com/qihang/security/LoginUser.java b/security/src/main/java/cn/qihangerp/security/LoginUser.java similarity index 98% rename from security/src/main/java/com/qihang/security/LoginUser.java rename to security/src/main/java/cn/qihangerp/security/LoginUser.java index d3599124..c87e806d 100644 --- a/security/src/main/java/com/qihang/security/LoginUser.java +++ b/security/src/main/java/cn/qihangerp/security/LoginUser.java @@ -1,7 +1,7 @@ -package com.qihang.security; +package cn.qihangerp.security; +import cn.qihangerp.security.entity.SysUser; import com.alibaba.fastjson2.annotation.JSONField; -import com.qihang.security.entity.SysUser; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/security/src/main/java/com/qihang/security/LogoutSuccessHandlerImpl.java b/security/src/main/java/cn/qihangerp/security/LogoutSuccessHandlerImpl.java similarity index 87% rename from security/src/main/java/com/qihang/security/LogoutSuccessHandlerImpl.java rename to security/src/main/java/cn/qihangerp/security/LogoutSuccessHandlerImpl.java index 80317e70..3bf87402 100644 --- a/security/src/main/java/com/qihang/security/LogoutSuccessHandlerImpl.java +++ b/security/src/main/java/cn/qihangerp/security/LogoutSuccessHandlerImpl.java @@ -1,11 +1,10 @@ -package com.qihang.security; +package cn.qihangerp.security; import com.alibaba.fastjson2.JSON; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.constant.Constants; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.utils.ServletUtils; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.utils.ServletUtils; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/security/src/main/java/com/qihang/security/SecurityConfig.java b/security/src/main/java/cn/qihangerp/security/SecurityConfig.java similarity index 99% rename from security/src/main/java/com/qihang/security/SecurityConfig.java rename to security/src/main/java/cn/qihangerp/security/SecurityConfig.java index c14a2109..0c3acb47 100644 --- a/security/src/main/java/com/qihang/security/SecurityConfig.java +++ b/security/src/main/java/cn/qihangerp/security/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.qihang.security; +package cn.qihangerp.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/security/src/main/java/com/qihang/security/TokenService.java b/security/src/main/java/cn/qihangerp/security/TokenService.java similarity index 93% rename from security/src/main/java/com/qihang/security/TokenService.java rename to security/src/main/java/cn/qihangerp/security/TokenService.java index c7d8824e..fbfaf54b 100644 --- a/security/src/main/java/com/qihang/security/TokenService.java +++ b/security/src/main/java/cn/qihangerp/security/TokenService.java @@ -1,13 +1,13 @@ -package com.qihang.security; +package cn.qihangerp.security; -import com.qihang.common.config.RedisCache; -import com.qihang.common.constant.CacheConstants; -import com.qihang.common.constant.Constants; -import com.qihang.common.utils.IdUtils; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.utils.AddressUtils; -import com.qihang.security.utils.IpUtils; -import com.qihang.security.utils.ServletUtils; +import cn.qihangerp.security.utils.AddressUtils; +import cn.qihangerp.security.utils.IpUtils; +import cn.qihangerp.security.utils.ServletUtils; +import cn.qihangerp.common.config.RedisCache; +import cn.qihangerp.common.constant.CacheConstants; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.common.utils.IdUtils; +import cn.qihangerp.common.utils.StringUtils; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/security/src/main/java/com/qihang/security/UserDetailsServiceImpl.java b/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java similarity index 87% rename from security/src/main/java/com/qihang/security/UserDetailsServiceImpl.java rename to security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java index 4d17f890..d6e93066 100644 --- a/security/src/main/java/com/qihang/security/UserDetailsServiceImpl.java +++ b/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.security; +package cn.qihangerp.security; -import com.qihang.common.common.ServiceException; -import com.qihang.common.enums.UserStatus; -import com.qihang.common.utils.MessageUtils; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.enums.UserStatus; +import cn.qihangerp.common.utils.MessageUtils; +import cn.qihangerp.common.utils.StringUtils; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.ISysUserService; +import cn.qihangerp.security.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/security/src/main/java/com/qihang/security/UserPasswordNotMatchException.java b/security/src/main/java/cn/qihangerp/security/UserPasswordNotMatchException.java similarity index 78% rename from security/src/main/java/com/qihang/security/UserPasswordNotMatchException.java rename to security/src/main/java/cn/qihangerp/security/UserPasswordNotMatchException.java index ea2a9254..0ea51527 100644 --- a/security/src/main/java/com/qihang/security/UserPasswordNotMatchException.java +++ b/security/src/main/java/cn/qihangerp/security/UserPasswordNotMatchException.java @@ -1,6 +1,6 @@ -package com.qihang.security; +package cn.qihangerp.security; -import com.qihang.common.exception.UserException; +import cn.qihangerp.common.exception.UserException; /** * 用户密码不正确或不符合规范异常类 diff --git a/security/src/main/java/com/qihang/security/common/BaseController.java b/security/src/main/java/cn/qihangerp/security/common/BaseController.java similarity index 90% rename from security/src/main/java/com/qihang/security/common/BaseController.java rename to security/src/main/java/cn/qihangerp/security/common/BaseController.java index 6f7a8ad4..ec5a15bb 100644 --- a/security/src/main/java/com/qihang/security/common/BaseController.java +++ b/security/src/main/java/cn/qihangerp/security/common/BaseController.java @@ -1,11 +1,11 @@ -package com.qihang.security.common; +package cn.qihangerp.security.common; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.enums.HttpStatus; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.LoginUser; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/security/src/main/java/cn/qihangerp/security/common/Constants.java b/security/src/main/java/cn/qihangerp/security/common/Constants.java new file mode 100644 index 00000000..54ed8c48 --- /dev/null +++ b/security/src/main/java/cn/qihangerp/security/common/Constants.java @@ -0,0 +1,108 @@ +package cn.qihangerp.security.common; + +import io.jsonwebtoken.Claims; + +/** + * 通用常量信息 + * + * @author qihang + */ +public class Constants +{ + + /** + * 登录成功 + */ + public static final String LOGIN_SUCCESS = "Success"; + + /** + * 注销 + */ + public static final String LOGOUT = "Logout"; + + /** + * 注册 + */ + public static final String REGISTER = "Register"; + + /** + * 登录失败 + */ + public static final String LOGIN_FAIL = "Error"; + + /** + * 验证码有效期（分钟） + */ + public static final Integer CAPTCHA_EXPIRATION = 2; + + /** + * 令牌 + */ + public static final String TOKEN = "token"; + + /** + * 令牌前缀 + */ + public static final String TOKEN_PREFIX = "Bearer "; + + /** + * 令牌前缀 + */ + public static final String LOGIN_USER_KEY = "login_user_key"; + + /** + * 用户ID + */ + public static final String JWT_USERID = "userid"; + + /** + * 用户名称 + */ + public static final String JWT_USERNAME = Claims.SUBJECT; + + /** + * 用户头像 + */ + public static final String JWT_AVATAR = "avatar"; + + /** + * 创建时间 + */ + public static final String JWT_CREATED = "created"; + + /** + * 用户权限 + */ + public static final String JWT_AUTHORITIES = "authorities"; + + /** + * 资源映射路径 前缀 + */ + public static final String RESOURCE_PREFIX = "/profile"; + + /** + * RMI 远程方法调用 + */ + public static final String LOOKUP_RMI = "rmi:"; + + /** + * LDAP 远程方法调用 + */ + public static final String LOOKUP_LDAP = "ldap:"; + + /** + * LDAPS 远程方法调用 + */ + public static final String LOOKUP_LDAPS = "ldaps:"; + + /** + * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） + */ + public static final String[] JOB_WHITELIST_STR = { "com.zhijian" }; + + /** + * 定时任务违规的字符 + */ + public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.zhijian.common.utils.file", "com.zhijian.common.config" }; +} diff --git a/security/src/main/java/com/qihang/security/common/SecurityUtils.java b/security/src/main/java/cn/qihangerp/security/common/SecurityUtils.java similarity index 93% rename from security/src/main/java/com/qihang/security/common/SecurityUtils.java rename to security/src/main/java/cn/qihangerp/security/common/SecurityUtils.java index bd7de738..394c5db9 100644 --- a/security/src/main/java/com/qihang/security/common/SecurityUtils.java +++ b/security/src/main/java/cn/qihangerp/security/common/SecurityUtils.java @@ -1,9 +1,9 @@ -package com.qihang.security.common; +package cn.qihangerp.security.common; -import com.qihang.common.common.ServiceException; -import com.qihang.common.enums.HttpStatus; -import com.qihang.security.LoginUser; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.security.LoginUser; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/security/src/main/java/com/qihang/security/entity/SysUser.java b/security/src/main/java/cn/qihangerp/security/entity/SysUser.java similarity index 99% rename from security/src/main/java/com/qihang/security/entity/SysUser.java rename to security/src/main/java/cn/qihangerp/security/entity/SysUser.java index c21472a2..0e9ad62d 100644 --- a/security/src/main/java/com/qihang/security/entity/SysUser.java +++ b/security/src/main/java/cn/qihangerp/security/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.qihang.security.entity; +package cn.qihangerp.security.entity; import java.util.Date; diff --git a/security/src/main/java/com/qihang/security/mapper/SysUserMapper.java b/security/src/main/java/cn/qihangerp/security/mapper/SysUserMapper.java similarity index 100% rename from security/src/main/java/com/qihang/security/mapper/SysUserMapper.java rename to security/src/main/java/cn/qihangerp/security/mapper/SysUserMapper.java diff --git a/security/src/main/java/com/qihang/security/service/ISysUserService.java b/security/src/main/java/cn/qihangerp/security/service/ISysUserService.java similarity index 97% rename from security/src/main/java/com/qihang/security/service/ISysUserService.java rename to security/src/main/java/cn/qihangerp/security/service/ISysUserService.java index f37f213b..7c86192e 100644 --- a/security/src/main/java/com/qihang/security/service/ISysUserService.java +++ b/security/src/main/java/cn/qihangerp/security/service/ISysUserService.java @@ -1,7 +1,7 @@ -package com.qihang.security.service; +package cn.qihangerp.security.service; -import com.qihang.security.entity.SysUser; +import cn.qihangerp.security.entity.SysUser; import java.util.List; diff --git a/security/src/main/java/com/qihang/security/service/SysLoginService.java b/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java similarity index 88% rename from security/src/main/java/com/qihang/security/service/SysLoginService.java rename to security/src/main/java/cn/qihangerp/security/service/SysLoginService.java index 27e3dd65..00c18fd0 100644 --- a/security/src/main/java/com/qihang/security/service/SysLoginService.java +++ b/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java @@ -1,18 +1,18 @@ -package com.qihang.security.service; +package cn.qihangerp.security.service; -import com.qihang.common.common.ServiceException; -import com.qihang.common.config.RedisCache; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.exception.UserNotExistsException; -import com.qihang.common.utils.DateUtils; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.AuthenticationContextHolder; -import com.qihang.security.LoginUser; -import com.qihang.security.TokenService; -import com.qihang.security.UserPasswordNotMatchException; -import com.qihang.security.entity.SysUser; -import com.qihang.security.utils.IpUtils; +import cn.qihangerp.security.UserPasswordNotMatchException; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.utils.IpUtils; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.config.RedisCache; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.exception.UserNotExistsException; +import cn.qihangerp.common.utils.DateUtils; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.AuthenticationContextHolder; +import cn.qihangerp.security.LoginUser; +import cn.qihangerp.security.TokenService; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; diff --git a/security/src/main/java/com/qihang/security/service/impl/SysUserServiceImpl.java b/security/src/main/java/cn/qihangerp/security/service/impl/SysUserServiceImpl.java similarity index 100% rename from security/src/main/java/com/qihang/security/service/impl/SysUserServiceImpl.java rename to security/src/main/java/cn/qihangerp/security/service/impl/SysUserServiceImpl.java diff --git a/security/src/main/java/com/qihang/security/utils/AddressUtils.java b/security/src/main/java/cn/qihangerp/security/utils/AddressUtils.java similarity index 91% rename from security/src/main/java/com/qihang/security/utils/AddressUtils.java rename to security/src/main/java/cn/qihangerp/security/utils/AddressUtils.java index aba6e5ef..99f0fe8e 100644 --- a/security/src/main/java/com/qihang/security/utils/AddressUtils.java +++ b/security/src/main/java/cn/qihangerp/security/utils/AddressUtils.java @@ -1,9 +1,9 @@ -package com.qihang.security.utils; +package cn.qihangerp.security.utils; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.qihang.common.constant.Constants; -import com.qihang.common.utils.http.HttpUtils; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.common.utils.http.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; diff --git a/security/src/main/java/com/qihang/security/utils/IpUtils.java b/security/src/main/java/cn/qihangerp/security/utils/IpUtils.java similarity index 99% rename from security/src/main/java/com/qihang/security/utils/IpUtils.java rename to security/src/main/java/cn/qihangerp/security/utils/IpUtils.java index a603cb02..b7a2d15b 100644 --- a/security/src/main/java/com/qihang/security/utils/IpUtils.java +++ b/security/src/main/java/cn/qihangerp/security/utils/IpUtils.java @@ -1,6 +1,6 @@ -package com.qihang.security.utils; +package cn.qihangerp.security.utils; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.StringUtils; import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; diff --git a/security/src/main/java/com/qihang/security/utils/ServletUtils.java b/security/src/main/java/cn/qihangerp/security/utils/ServletUtils.java similarity index 96% rename from security/src/main/java/com/qihang/security/utils/ServletUtils.java rename to security/src/main/java/cn/qihangerp/security/utils/ServletUtils.java index b03ffda0..682cf9cb 100644 --- a/security/src/main/java/com/qihang/security/utils/ServletUtils.java +++ b/security/src/main/java/cn/qihangerp/security/utils/ServletUtils.java @@ -1,8 +1,8 @@ -package com.qihang.security.utils; +package cn.qihangerp.security.utils; -import com.qihang.common.constant.Convert; -import com.qihang.common.constant.Constants; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.constant.Convert; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.common.utils.StringUtils; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/security/src/main/java/com/qihang/security/vo/MetaVo.java b/security/src/main/java/cn/qihangerp/security/vo/MetaVo.java similarity index 95% rename from security/src/main/java/com/qihang/security/vo/MetaVo.java rename to security/src/main/java/cn/qihangerp/security/vo/MetaVo.java index a95d4a81..283f77e9 100644 --- a/security/src/main/java/com/qihang/security/vo/MetaVo.java +++ b/security/src/main/java/cn/qihangerp/security/vo/MetaVo.java @@ -1,7 +1,7 @@ -package com.qihang.security.vo; +package cn.qihangerp.security.vo; -import com.qihang.common.utils.StringUtils; +import cn.qihangerp.common.utils.StringUtils; /** * 路由显示信息 diff --git a/security/src/main/java/com/qihang/security/vo/RouterVo.java b/security/src/main/java/cn/qihangerp/security/vo/RouterVo.java similarity index 98% rename from security/src/main/java/com/qihang/security/vo/RouterVo.java rename to security/src/main/java/cn/qihangerp/security/vo/RouterVo.java index e0a72d10..af892ac7 100644 --- a/security/src/main/java/com/qihang/security/vo/RouterVo.java +++ b/security/src/main/java/cn/qihangerp/security/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.qihang.security.vo; +package cn.qihangerp.security.vo; import java.util.List; diff --git a/sys-api/pom.xml b/sys-api/pom.xml index 35cba37b..a54a4be6 100644 --- a/sys-api/pom.xml +++ b/sys-api/pom.xml @@ -7,6 +7,7 @@ 3.0.2 + cn.qihangerp.api sys-api 1.0 jar diff --git a/sys-api/src/main/java/com/qihang/sys/api/SysApi.java b/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java similarity index 83% rename from sys-api/src/main/java/com/qihang/sys/api/SysApi.java rename to sys-api/src/main/java/cn/qihangerp/sys/SysApi.java index 0ff7251d..a0a3d7f0 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/SysApi.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/SysApi.java @@ -1,6 +1,5 @@ -package com.qihang.sys.api; +package cn.qihangerp.sys; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -14,9 +13,9 @@ import org.springframework.web.client.RestTemplate; * Hello world! * */ -@EnableFeignClients(basePackages = "com.qihang.sys.api") +@EnableFeignClients(basePackages = "cn.qihangerp.sys") @EnableDiscoveryClient -@ComponentScan(basePackages={"com.qihang"}) +@ComponentScan(basePackages={"cn.qihangerp"}) //@MapperScan("com.qihang.sys.api.mapper") @SpringBootApplication public class SysApi diff --git a/sys-api/src/main/java/com/qihang/sys/api/common/DictUtils.java b/sys-api/src/main/java/cn/qihangerp/sys/common/DictUtils.java similarity index 94% rename from sys-api/src/main/java/com/qihang/sys/api/common/DictUtils.java rename to sys-api/src/main/java/cn/qihangerp/sys/common/DictUtils.java index 64c14c71..0827c7e1 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/common/DictUtils.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/common/DictUtils.java @@ -1,11 +1,11 @@ -package com.qihang.sys.api.common; +package cn.qihangerp.sys.common; import com.alibaba.fastjson2.JSONArray; -import com.qihang.common.config.RedisCache; -import com.qihang.common.constant.CacheConstants; -import com.qihang.common.utils.SpringUtils; -import com.qihang.common.utils.StringUtils; -import com.qihang.sys.api.domain.SysDictData; +import cn.qihangerp.common.config.RedisCache; +import cn.qihangerp.common.constant.CacheConstants; +import cn.qihangerp.common.utils.SpringUtils; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.sys.domain.SysDictData; import java.util.Collection; import java.util.List; diff --git a/oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java b/sys-api/src/main/java/cn/qihangerp/sys/config/MybatisPlusConfig.java similarity index 90% rename from oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java rename to sys-api/src/main/java/cn/qihangerp/sys/config/MybatisPlusConfig.java index 8074cc71..a0d459e1 100644 --- a/oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.qihang.oms.config; +package cn.qihangerp.sys.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -@MapperScan("com.qihang.oms.mapper") +@MapperScan("cn.qihangerp.sys.mapper") public class MybatisPlusConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/HomeController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java similarity index 93% rename from sys-api/src/main/java/com/qihang/sys/api/controller/HomeController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java index 99d80661..35a7a3dd 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/HomeController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/HomeController.java @@ -1,6 +1,6 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.sys.api.feign.EchoService; +import cn.qihangerp.sys.feign.EchoService; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysDictDataController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java similarity index 86% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysDictDataController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java index 52664a05..6faf1c7c 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysDictDataController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java @@ -1,13 +1,13 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.BaseController; -import com.qihang.sys.api.domain.SysDictData; -import com.qihang.sys.api.service.ISysDictDataService; -import com.qihang.sys.api.service.ISysDictTypeService; +import cn.qihangerp.sys.service.ISysDictDataService; +import cn.qihangerp.sys.service.ISysDictTypeService; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.common.BaseController; +import cn.qihangerp.sys.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysDictTypeController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java similarity index 90% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysDictTypeController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java index 5cc1d37f..9defea7b 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysDictTypeController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java @@ -1,11 +1,11 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; -import com.qihang.sys.api.domain.SysDictType; -import com.qihang.sys.api.service.ISysDictTypeService; +import cn.qihangerp.sys.service.ISysDictTypeService; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.security.common.BaseController; +import cn.qihangerp.sys.domain.SysDictType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java similarity index 80% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java index 5589f462..bcb948df 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java @@ -1,14 +1,15 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.constant.Constants; -import com.qihang.security.common.SecurityUtils; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.SysLoginService; -import com.qihang.sys.api.domain.LoginBody; -import com.qihang.sys.api.domain.SysMenu; -import com.qihang.sys.api.service.SysMenuService; -import com.qihang.sys.api.service.SysPermissionService; + +import cn.qihangerp.sys.service.ISysMenuService; +import cn.qihangerp.sys.service.SysPermissionService; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.security.common.SecurityUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.service.SysLoginService; +import cn.qihangerp.sys.domain.LoginBody; +import cn.qihangerp.sys.domain.SysMenu; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -30,7 +31,7 @@ public class SysLoginController private SysLoginService loginService; @Autowired - private SysMenuService menuService; + private ISysMenuService menuService; @Autowired private SysPermissionService permissionService; diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysMenuController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java similarity index 52% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysMenuController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java index 1b4c5f7b..9ad269c3 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysMenuController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java @@ -1,12 +1,13 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.BaseController; -import com.qihang.sys.api.domain.SysMenu; -import com.qihang.sys.api.service.SysMenuService; + +import cn.qihangerp.sys.domain.SysMenu; +import cn.qihangerp.sys.service.ISysMenuService; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.common.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.qihang.common.common.AjaxResult.success; -import static com.qihang.common.common.AjaxResult.warn; /** * 菜单信息 @@ -27,7 +26,7 @@ import static com.qihang.common.common.AjaxResult.warn; public class SysMenuController extends BaseController { @Autowired - private SysMenuService menuService; + private ISysMenuService menuService; /** * 获取菜单列表 @@ -36,9 +35,7 @@ public class SysMenuController extends BaseController @GetMapping("/list") public AjaxResult list(SysMenu menu) { -// List menus = menuService.selectMenuList(menu, getUserId()); - List menus = menuService.list(); - + List menus = menuService.selectMenuList(menu, getUserId()); return success(menus); } @@ -49,32 +46,32 @@ public class SysMenuController extends BaseController @GetMapping(value = "/{menuId}") public AjaxResult getInfo(@PathVariable Long menuId) { - return success(menuService.getById(menuId)); + return success(menuService.selectMenuById(menuId)); + } + + /** + * 获取菜单下拉树列表 + */ + @GetMapping("/treeselect") + public AjaxResult treeselect(SysMenu menu) + { + List menus = menuService.selectMenuList(menu, getUserId()); + return success(menuService.buildMenuTreeSelect(menus)); + } + + /** + * 加载对应角色菜单列表树 + */ + @GetMapping(value = "/roleMenuTreeselect/{roleId}") + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) + { + List menus = menuService.selectMenuList(getUserId()); + AjaxResult ajax = success(); + ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); + ajax.put("menus", menuService.buildMenuTreeSelect(menus)); + return ajax; } -// /** -// * 获取菜单下拉树列表 -// */ -// @GetMapping("/treeselect") -// public AjaxResult treeselect(SysMenu menu) -// { -// List menus = menuService.selectMenuList(menu, getUserId()); -// return success(menuService.buildMenuTreeSelect(menus)); -// } -// -// /** -// * 加载对应角色菜单列表树 -// */ -// @GetMapping(value = "/roleMenuTreeselect/{roleId}") -// public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) -// { -// List menus = menuService.selectMenuList(getUserId()); -// AjaxResult ajax = success(); -// ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); -// ajax.put("menus", menuService.buildMenuTreeSelect(menus)); -// return ajax; -// } -// /** * 新增菜单 */ @@ -91,7 +88,7 @@ public class SysMenuController extends BaseController return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); } menu.setCreateBy(getUsername()); - return toAjax(menuService.save(menu)); + return toAjax(menuService.insertMenu(menu)); } /** @@ -114,24 +111,24 @@ public class SysMenuController extends BaseController return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); } menu.setUpdateBy(getUsername()); - return toAjax(menuService.updateById(menu)); + return toAjax(menuService.updateMenu(menu)); + } + + /** + * 删除菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:remove')") + @DeleteMapping("/{menuId}") + public AjaxResult remove(@PathVariable("menuId") Long menuId) + { + if (menuService.hasChildByMenuId(menuId)) + { + return warn("存在子菜单,不允许删除"); + } + if (menuService.checkMenuExistRole(menuId)) + { + return warn("菜单已分配,不允许删除"); + } + return toAjax(menuService.deleteMenuById(menuId)); } -// -// /** -// * 删除菜单 -// */ -// @PreAuthorize("@ss.hasPermi('system:menu:remove')") -// @DeleteMapping("/{menuId}") -// public AjaxResult remove(@PathVariable("menuId") Long menuId) -// { -// if (menuService.hasChildByMenuId(menuId)) -// { -// return warn("存在子菜单,不允许删除"); -// } -// if (menuService.checkMenuExistRole(menuId)) -// { -// return warn("菜单已分配,不允许删除"); -// } -// return toAjax(menuService.deleteMenuById(menuId)); -// } } \ No newline at end of file diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysTaskController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java similarity index 71% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysTaskController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java index 410ca173..5fedac38 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysTaskController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java @@ -1,13 +1,13 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.common.common.TableDataInfo; -import com.qihang.security.common.BaseController; -import com.qihang.sys.api.domain.SysTask; -import com.qihang.sys.api.service.SysTaskLogsService; -import com.qihang.sys.api.service.SysTaskService; +import cn.qihangerp.sys.service.SysTaskLogsService; +import cn.qihangerp.sys.service.SysTaskService; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.common.TableDataInfo; +import cn.qihangerp.security.common.BaseController; +import cn.qihangerp.sys.domain.SysTask; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysUserController.java b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java similarity index 94% rename from sys-api/src/main/java/com/qihang/sys/api/controller/SysUserController.java rename to sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java index b31e143e..011743bb 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysUserController.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java @@ -1,13 +1,13 @@ -package com.qihang.sys.api.controller; +package cn.qihangerp.sys.controller; -import com.qihang.common.common.AjaxResult; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.BaseController; -import com.qihang.security.common.SecurityUtils; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.ISysUserService; -import com.qihang.common.common.TableDataInfo; +import cn.qihangerp.common.common.AjaxResult; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.common.BaseController; +import cn.qihangerp.security.common.SecurityUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.service.ISysUserService; +import cn.qihangerp.common.common.TableDataInfo; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/BaseEntity.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/BaseEntity.java similarity index 98% rename from sys-api/src/main/java/com/qihang/sys/api/domain/BaseEntity.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/BaseEntity.java index 52a6a949..4882dd38 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/BaseEntity.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/LoginBody.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/LoginBody.java similarity index 96% rename from sys-api/src/main/java/com/qihang/sys/api/domain/LoginBody.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/LoginBody.java index b6fa3b69..c190ef2c 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/LoginBody.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/LoginBody.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; /** * 用户登录对象 diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDept.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDept.java new file mode 100644 index 00000000..775462c6 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDept.java @@ -0,0 +1,195 @@ +package cn.qihangerp.sys.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.ArrayList; +import java.util.List; + +/** + * 部门表 sys_dept + * + * @author qihang + */ +public class SysDept extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 部门ID */ + private Long deptId; + + /** 父部门ID */ + private Long parentId; + + /** 祖级列表 */ + private String ancestors; + + /** 部门名称 */ + private String deptName; + + /** 显示顺序 */ + private Integer orderNum; + + /** 负责人 */ + private String leader; + + /** 联系电话 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 部门状态:0正常,1停用 */ + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 父部门名称 */ + private String parentName; + + /** 子部门 */ + private List children = new ArrayList(); + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getLeader() + { + return leader; + } + + public void setLeader(String leader) + { + this.leader = leader; + } + + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysDictData.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictData.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/domain/SysDictData.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictData.java index bb7d6b44..82951a82 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysDictData.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictData.java @@ -1,7 +1,7 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; -import com.qihang.common.constant.UserConstants; +import cn.qihangerp.common.constant.UserConstants; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysDictType.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictType.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/domain/SysDictType.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictType.java index 97d54a7d..a0e2362f 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysDictType.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysDictType.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/SysMenu.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysMenu.java new file mode 100644 index 00000000..954e971a --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysMenu.java @@ -0,0 +1,278 @@ +package cn.qihangerp.sys.domain; + +import cn.qihangerp.sys.domain.vo.MenusDetailVo; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.ArrayList; +import java.util.List; + +/** + * 菜单权限表 sys_menu + * + * @author qihang + */ +public class SysMenu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单ID */ + private Long menuId; + + /** 菜单名称 */ +// @JsonProperty("title") + private String menuName; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 路由地址 */ + private String path; + + /** 组件路径 */ + private String component; + + /** 路由参数 */ + private String query; + + /** 是否为外链（0是 1否） */ + private String isFrame; + + /** 是否缓存（0缓存 1不缓存） */ + private String isCache; + + /** 类型（M目录 C菜单 F按钮） */ + private String menuType; + + /** 显示状态（0显示 1隐藏） */ + private String visible; + + /** 菜单状态（0正常 1停用） */ + private String status; + + /** 权限字符串 */ + private String perms; + + /** 菜单图标 */ + private String icon; + private String redirect; + private String name; + + /** 子菜单 */ + private List children = new ArrayList(); + private MenusDetailVo meta; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRedirect() { + return redirect; + } + + public void setRedirect(String redirect) { + this.redirect = redirect; + } + + public MenusDetailVo getMeta() { + return meta; + } + + public void setMeta(MenusDetailVo meta) { + this.meta = meta; + } + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + public String getMenuName() + { + return menuName; + } + + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getPath() + { + return path; + } + + public void setPath(String path) + { + this.path = path; + } + + public String getComponent() + { + return component; + } + + public void setComponent(String component) + { + this.component = component; + } + + public String getQuery() + { + return query; + } + + public void setQuery(String query) + { + this.query = query; + } + + public String getIsFrame() + { + return isFrame; + } + + public void setIsFrame(String isFrame) + { + this.isFrame = isFrame; + } + + public String getIsCache() + { + return isCache; + } + + public void setIsCache(String isCache) + { + this.isCache = isCache; + } + + public String getMenuType() + { + return menuType; + } + + public void setMenuType(String menuType) + { + this.menuType = menuType; + } + + public String getVisible() + { + return visible; + } + + public void setVisible(String visible) + { + this.visible = visible; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getPerms() + { + return perms; + } + + public void setPerms(String perms) + { + this.perms = perms; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("path", getPath()) + .append("component", getComponent()) + .append("isFrame", getIsFrame()) + .append("IsCache", getIsCache()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("status ", getStatus()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRole.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRole.java new file mode 100644 index 00000000..ebc85c28 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRole.java @@ -0,0 +1,262 @@ +package cn.qihangerp.sys.domain; + +import java.util.Date; +import java.util.Map; +import java.util.Set; + +/** + * 角色表 sys_role + * + * @author qihang + */ +public class SysRole +{ + private static final long serialVersionUID = 1L; + + /** 角色ID */ + private Long roleId; + + /** 角色名称 */ + private String roleName; + + /** 角色权限 */ + private String roleKey; + + /** 角色排序 */ + private Integer roleSort; + + /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ + private String dataScope; + + /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ + private boolean menuCheckStrictly; + + /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ + private boolean deptCheckStrictly; + + /** 角色状态（0正常 1停用） */ + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 用户是否存在此角色标识 默认不存在 */ + private boolean flag = false; + + /** 菜单组 */ + private Long[] menuIds; + + /** 部门组（数据权限） */ + private Long[] deptIds; + + /** 角色菜单权限 */ + private Set permissions; + + private String createBy; + private Date createTime; + private String updateBy; + + private Date updateTime; + private String remark; + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public SysRole() + { + + } + + public SysRole(Long roleId) + { + this.roleId = roleId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public boolean isAdmin() + { + return isAdmin(this.roleId); + } + + public static boolean isAdmin(Long roleId) + { + return roleId != null && 1L == roleId; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public String getRoleName() + { + return roleName; + } + + public void setRoleName(String roleName) + { + this.roleName = roleName; + } + + + public String getRoleKey() + { + return roleKey; + } + + public void setRoleKey(String roleKey) + { + this.roleKey = roleKey; + } + + public Integer getRoleSort() + { + return roleSort; + } + + public void setRoleSort(Integer roleSort) + { + this.roleSort = roleSort; + } + + public String getDataScope() + { + return dataScope; + } + + public void setDataScope(String dataScope) + { + this.dataScope = dataScope; + } + + public boolean isMenuCheckStrictly() + { + return menuCheckStrictly; + } + + public void setMenuCheckStrictly(boolean menuCheckStrictly) + { + this.menuCheckStrictly = menuCheckStrictly; + } + + public boolean isDeptCheckStrictly() + { + return deptCheckStrictly; + } + + public void setDeptCheckStrictly(boolean deptCheckStrictly) + { + this.deptCheckStrictly = deptCheckStrictly; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + public Long[] getMenuIds() + { + return menuIds; + } + + public void setMenuIds(Long[] menuIds) + { + this.menuIds = menuIds; + } + + public Long[] getDeptIds() + { + return deptIds; + } + + public void setDeptIds(Long[] deptIds) + { + this.deptIds = deptIds; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + private Map params; + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRoleMenu.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRoleMenu.java new file mode 100644 index 00000000..bbc6f6c3 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysRoleMenu.java @@ -0,0 +1,46 @@ +package cn.qihangerp.sys.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和菜单关联 sys_role_menu + * + * @author qihang + */ +public class SysRoleMenu +{ + /** 角色ID */ + private Long roleId; + + /** 菜单ID */ + private Long menuId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("menuId", getMenuId()) + .toString(); + } +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysTask.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysTask.java similarity index 99% rename from sys-api/src/main/java/com/qihang/sys/api/domain/SysTask.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/SysTask.java index 25f0faf3..079fe32e 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysTask.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysTask.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; import java.io.Serializable; import java.util.Date; diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysTaskLogs.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysTaskLogs.java similarity index 99% rename from sys-api/src/main/java/com/qihang/sys/api/domain/SysTaskLogs.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/SysTaskLogs.java index 0941ccd0..6497288d 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysTaskLogs.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysTaskLogs.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain; +package cn.qihangerp.sys.domain; import java.io.Serializable; import java.util.Date; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/SysUserRole.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysUserRole.java new file mode 100644 index 00000000..64b1157d --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/SysUserRole.java @@ -0,0 +1,46 @@ +package cn.qihangerp.sys.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和角色关联 sys_user_role + * + * @author qihang + */ +public class SysUserRole +{ + /** 用户ID */ + private Long userId; + + /** 角色ID */ + private Long roleId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenuMetaVo.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenuMetaVo.java new file mode 100644 index 00000000..4e696b71 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenuMetaVo.java @@ -0,0 +1,4 @@ +package cn.qihangerp.sys.domain.vo; + +public class MenuMetaVo { +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusDetailVo.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusDetailVo.java similarity index 96% rename from sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusDetailVo.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusDetailVo.java index f99d3495..a791c4de 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusDetailVo.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusDetailVo.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain.vo; +package cn.qihangerp.sys.domain.vo; import java.util.List; diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusVo.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusVo.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusVo.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusVo.java index e86f5f98..7c0fecf0 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenusVo.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/MenusVo.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain.vo; +package cn.qihangerp.sys.domain.vo; import java.util.List; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/TreeSelect.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/TreeSelect.java new file mode 100644 index 00000000..2f912afa --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/TreeSelect.java @@ -0,0 +1,77 @@ +package cn.qihangerp.sys.domain.vo; + + +import cn.qihangerp.sys.domain.SysDept; +import cn.qihangerp.sys.domain.SysMenu; + +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Treeselect树结构实体类 + * + * @author qihang + */ +public class TreeSelect implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 节点ID */ + private Long id; + + /** 节点名称 */ + private String label; + + /** 子节点 */ + private List children; + + public TreeSelect() + { + + } + + public TreeSelect(SysDept dept) + { + this.id = dept.getDeptId(); + this.label = dept.getDeptName(); + this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + public TreeSelect(SysMenu menu) + { + this.id = menu.getMenuId(); + this.label = menu.getMenuName(); + this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/UserInfoVo.java b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/UserInfoVo.java similarity index 96% rename from sys-api/src/main/java/com/qihang/sys/api/domain/vo/UserInfoVo.java rename to sys-api/src/main/java/cn/qihangerp/sys/domain/vo/UserInfoVo.java index aaf725c0..d1d9d712 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/UserInfoVo.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/domain/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.domain.vo; +package cn.qihangerp.sys.domain.vo; import java.util.List; diff --git a/sys-api/src/main/java/com/qihang/sys/api/feign/EchoService.java b/sys-api/src/main/java/cn/qihangerp/sys/feign/EchoService.java similarity index 91% rename from sys-api/src/main/java/com/qihang/sys/api/feign/EchoService.java rename to sys-api/src/main/java/cn/qihangerp/sys/feign/EchoService.java index 564a138a..b6708b03 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/feign/EchoService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/feign/EchoService.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.feign; +package cn.qihangerp.sys.feign; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDeptMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDeptMapper.java new file mode 100644 index 00000000..5691daa4 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDeptMapper.java @@ -0,0 +1,121 @@ +package cn.qihangerp.sys.mapper; + + + +import cn.qihangerp.sys.domain.SysDept; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 部门管理 数据层 + * + * @author qihang + */ +public interface SysDeptMapper +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @param deptCheckStrictly 部门树选择项是否关联显示 + * @return 选中部门列表 + */ + public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 根据ID查询所有子部门 + * + * @param deptId 部门ID + * @return 部门列表 + */ + public List selectChildrenDeptById(Long deptId); + + /** + * 根据ID查询所有子部门（正常状态） + * + * @param deptId 部门ID + * @return 子部门数 + */ + public int selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + public int hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 + */ + public int checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param deptName 部门名称 + * @param parentId 父部门ID + * @return 结果 + */ + public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + + /** + * 新增部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 修改所在部门正常状态 + * + * @param deptIds 部门ID组 + */ + public void updateDeptStatusNormal(Long[] deptIds); + + /** + * 修改子元素关系 + * + * @param depts 子元素 + * @return 结果 + */ + public int updateDeptChildren(@Param("depts") List depts); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictDataMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictDataMapper.java similarity index 96% rename from sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictDataMapper.java rename to sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictDataMapper.java index 8113baac..b9f39249 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictDataMapper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictDataMapper.java @@ -1,7 +1,7 @@ -package com.qihang.sys.api.mapper; +package cn.qihangerp.sys.mapper; -import com.qihang.sys.api.domain.SysDictData; +import cn.qihangerp.sys.domain.SysDictData; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictTypeMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictTypeMapper.java similarity index 95% rename from sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictTypeMapper.java rename to sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictTypeMapper.java index 810a1f50..c47a6b5d 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysDictTypeMapper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ -package com.qihang.sys.api.mapper; +package cn.qihangerp.sys.mapper; -import com.qihang.sys.api.domain.SysDictType; +import cn.qihangerp.sys.domain.SysDictType; import java.util.List; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysMenuMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysMenuMapper.java new file mode 100644 index 00000000..08cb0af5 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysMenuMapper.java @@ -0,0 +1,127 @@ +package cn.qihangerp.sys.mapper; + + +import cn.qihangerp.sys.domain.SysMenu; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 菜单表 数据层 + * + * @author qihang + */ +public interface SysMenuMapper +{ + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu); + + /** + * 根据用户所有权限 + * + * @return 权限列表 + */ + public List selectMenuPerms(); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuListByUserId(SysMenu menu); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public List selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public List selectMenuPermsByUserId(Long userId); + + /** + * 根据用户ID查询菜单 + * + * @return 菜单列表 + */ + public List selectMenuTreeAll(); + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @param menuCheckStrictly 菜单树选择项是否关联显示 + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int hasChildByMenuId(Long menuId); + + /** + * 新增菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menuName 菜单名称 + * @param parentId 父菜单ID + * @return 结果 + */ + public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMapper.java new file mode 100644 index 00000000..4ee68a04 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMapper.java @@ -0,0 +1,111 @@ +package cn.qihangerp.sys.mapper; + + + + +import cn.qihangerp.sys.domain.SysRole; + +import java.util.List; + +/** + * 角色表 数据层 + * + * @author qihang + */ +public interface SysRoleMapper +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 根据用户ID查询角色 + * + * @param userName 用户名 + * @return 角色列表 + */ + public List selectRolesByUserName(String userName); + + /** + * 校验角色名称是否唯一 + * + * @param roleName 角色名称 + * @return 角色信息 + */ + public SysRole checkRoleNameUnique(String roleName); + + /** + * 校验角色权限是否唯一 + * + * @param roleKey 角色权限 + * @return 角色信息 + */ + public SysRole checkRoleKeyUnique(String roleKey); + + /** + * 修改角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 新增角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds); +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMenuMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMenuMapper.java new file mode 100644 index 00000000..442bb267 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysRoleMenuMapper.java @@ -0,0 +1,48 @@ +package cn.qihangerp.sys.mapper; + + + + +import cn.qihangerp.sys.domain.SysRoleMenu; + +import java.util.List; + +/** + * 角色与菜单关联表 数据层 + * + * @author qihang + */ +public interface SysRoleMenuMapper +{ + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int checkMenuExistRole(Long menuId); + + /** + * 通过角色ID删除角色和菜单关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleMenuByRoleId(Long roleId); + + /** + * 批量删除角色菜单关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleMenu(Long[] ids); + + /** + * 批量新增角色菜单信息 + * + * @param roleMenuList 角色菜单列表 + * @return 结果 + */ + public int batchRoleMenu(List roleMenuList); +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskLogsMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskLogsMapper.java similarity index 78% rename from sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskLogsMapper.java rename to sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskLogsMapper.java index 5aa77567..a86156a4 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskLogsMapper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskLogsMapper.java @@ -1,6 +1,6 @@ -package com.qihang.sys.api.mapper; +package cn.qihangerp.sys.mapper; -import com.qihang.sys.api.domain.SysTaskLogs; +import cn.qihangerp.sys.domain.SysTaskLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskMapper.java similarity index 78% rename from sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskMapper.java rename to sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskMapper.java index 6b8de662..2492c72f 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysTaskMapper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysTaskMapper.java @@ -1,6 +1,6 @@ -package com.qihang.sys.api.mapper; +package cn.qihangerp.sys.mapper; -import com.qihang.sys.api.domain.SysTask; +import cn.qihangerp.sys.domain.SysTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysUserMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserMapper.java similarity index 97% rename from sys-api/src/main/java/com/qihang/sys/api/mapper/SysUserMapper.java rename to sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserMapper.java index 0f68c936..d11b6dcd 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysUserMapper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserMapper.java @@ -1,6 +1,6 @@ -package com.qihang.sys.api.mapper; +package cn.qihangerp.sys.mapper; -import com.qihang.security.entity.SysUser; +import cn.qihangerp.security.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserRoleMapper.java b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserRoleMapper.java new file mode 100644 index 00000000..62b226b0 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/mapper/SysUserRoleMapper.java @@ -0,0 +1,64 @@ +package cn.qihangerp.sys.mapper; + + +import cn.qihangerp.sys.domain.SysUserRole; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户与角色关联表 数据层 + * + * @author qihang + */ +public interface SysUserRoleMapper +{ + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserRoleByUserId(Long userId); + + /** + * 批量删除用户和角色关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserRole(Long[] ids); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 批量新增用户角色信息 + * + * @param userRoleList 用户角色列表 + * @return 结果 + */ + public int batchUserRole(List userRoleList); + + /** + * 删除用户和角色关联信息 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteUserRoleInfo(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/ISysDictDataService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictDataService.java similarity index 94% rename from sys-api/src/main/java/com/qihang/sys/api/service/ISysDictDataService.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictDataService.java index cfce1f93..b51ea62e 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/ISysDictDataService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictDataService.java @@ -1,7 +1,7 @@ -package com.qihang.sys.api.service; +package cn.qihangerp.sys.service; -import com.qihang.sys.api.domain.SysDictData; +import cn.qihangerp.sys.domain.SysDictData; import java.util.List; diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/ISysDictTypeService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictTypeService.java similarity index 94% rename from sys-api/src/main/java/com/qihang/sys/api/service/ISysDictTypeService.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictTypeService.java index 8d9643c2..89ec9166 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/ISysDictTypeService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ -package com.qihang.sys.api.service; +package cn.qihangerp.sys.service; -import com.qihang.sys.api.domain.SysDictData; -import com.qihang.sys.api.domain.SysDictType; +import cn.qihangerp.sys.domain.SysDictData; +import cn.qihangerp.sys.domain.SysDictType; import java.util.List; diff --git a/sys-api/src/main/java/cn/qihangerp/sys/service/ISysMenuService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysMenuService.java new file mode 100644 index 00000000..67286737 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysMenuService.java @@ -0,0 +1,156 @@ +package cn.qihangerp.sys.service; + + + + +import cn.qihangerp.sys.domain.SysMenu; +import cn.qihangerp.sys.domain.vo.TreeSelect; +import cn.qihangerp.security.vo.RouterVo; + +import java.util.List; +import java.util.Set; + +/** + * 菜单 业务层 + * + * @author qihang + */ +public interface ISysMenuService +{ + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(Long userId); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu, Long userId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectMenuPermsByUserId(Long userId); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public Set selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询菜单树信息 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(Long roleId); + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + public List buildMenus(List menus); + + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ + public List buildMenuTree(List menus); + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + public List buildMenuTreeSelect(List menus); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean hasChildByMenuId(Long menuId); + + /** + * 查询菜单是否存在角色 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ +// public boolean checkMenuExistRole(Long menuId); + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean checkMenuNameUnique(SysMenu menu); + + /** + * 查询菜单是否存在角色 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkMenuExistRole(Long menuId); +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/service/ISysRoleService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysRoleService.java new file mode 100644 index 00000000..0f51b9dc --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/ISysRoleService.java @@ -0,0 +1,174 @@ +package cn.qihangerp.sys.service; + +import cn.qihangerp.sys.domain.SysRole; +import cn.qihangerp.sys.domain.SysUserRole; + +import java.util.List; +import java.util.Set; + +/** + * 角色业务层 + * + * @author qihang + */ +public interface ISysRoleService +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色列表 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolesByUserId(Long userId); + + /** + * 根据用户ID查询角色权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleNameUnique(SysRole role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleKeyUnique(SysRole role); + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + public void checkRoleAllowed(SysRole role); + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + public void checkRoleDataScope(Long roleId,Long userId); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRoleStatus(SysRole role); + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int authDataScope(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds,Long userId); + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteAuthUser(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + public int deleteAuthUsers(Long roleId, Long[] userIds); + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int insertAuthUsers(Long roleId, Long[] userIds); +} diff --git a/sys-api/src/main/java/cn/qihangerp/sys/service/SysMenuService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/SysMenuService.java new file mode 100644 index 00000000..81f5342e --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/SysMenuService.java @@ -0,0 +1,36 @@ +//package cn.qihangerp.sys.service; +// +//import com.qihang.security.vo.RouterVo; +//import cn.qihangerp.sys.domain.SysMenu; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import java.util.List; +//import java.util.Set; +// +///** +//* @author TW +//* @description 针对表【sys_menu(菜单权限表)】的数据库操作Service +//* @createDate 2024-05-15 10:14:01 +//*/ +//public interface SysMenuService extends IService { +// Set selectMenuPermsByUserId(Long userId); +// List selectMenuTreeByUserId(Long userId); +// List buildMenus(List menus); +// +// boolean checkMenuNameUnique(SysMenu menu); +// /** +// * 是否存在菜单子节点 +// * +// * @param menuId 菜单ID +// * @return 结果 true 存在 false 不存在 +// */ +// public boolean hasChildByMenuId(Long menuId); +// +// /** +// * 查询菜单是否存在角色 +// * +// * @param menuId 菜单ID +// * @return 结果 true 存在 false 不存在 +// */ +// public boolean checkMenuExistRole(Long menuId); +//} diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/SysPermissionService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/SysPermissionService.java similarity index 87% rename from sys-api/src/main/java/com/qihang/sys/api/service/SysPermissionService.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/SysPermissionService.java index 9f03e6b1..d8f69823 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/SysPermissionService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/SysPermissionService.java @@ -1,14 +1,11 @@ -package com.qihang.sys.api.service; +package cn.qihangerp.sys.service; -import com.qihang.security.entity.SysUser; -import com.qihang.sys.api.domain.SysRole; +import cn.qihangerp.security.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import java.util.HashSet; -import java.util.List; import java.util.Set; /** @@ -20,10 +17,10 @@ import java.util.Set; public class SysPermissionService { @Autowired - private SysRoleService roleService; + private ISysRoleService roleService; @Autowired - private SysMenuService menuService; + private ISysMenuService menuService; /** * 获取角色数据权限 diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/SysTaskLogsService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskLogsService.java similarity index 61% rename from sys-api/src/main/java/com/qihang/sys/api/service/SysTaskLogsService.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskLogsService.java index 74dc8554..13f024e4 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/SysTaskLogsService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskLogsService.java @@ -1,9 +1,8 @@ -package com.qihang.sys.api.service; +package cn.qihangerp.sys.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.sys.api.domain.SysTask; -import com.qihang.sys.api.domain.SysTaskLogs; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.sys.domain.SysTaskLogs; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/SysTaskService.java b/sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskService.java similarity index 64% rename from sys-api/src/main/java/com/qihang/sys/api/service/SysTaskService.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskService.java index f967cabc..4b9ba2cb 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/SysTaskService.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/SysTaskService.java @@ -1,8 +1,8 @@ -package com.qihang.sys.api.service; +package cn.qihangerp.sys.service; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.sys.api.domain.SysTask; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.sys.domain.SysTask; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictDataServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictDataServiceImpl.java similarity index 92% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictDataServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictDataServiceImpl.java index 83d2dc9d..073b556d 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictDataServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictDataServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; -import com.qihang.sys.api.common.DictUtils; -import com.qihang.sys.api.domain.SysDictData; -import com.qihang.sys.api.mapper.SysDictDataMapper; -import com.qihang.sys.api.service.ISysDictDataService; +import cn.qihangerp.sys.mapper.SysDictDataMapper; +import cn.qihangerp.sys.service.ISysDictDataService; +import cn.qihangerp.sys.common.DictUtils; +import cn.qihangerp.sys.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictTypeServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictTypeServiceImpl.java similarity index 92% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictTypeServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictTypeServiceImpl.java index 2ae0a921..6038d93b 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysDictTypeServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysDictTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; -import com.qihang.common.common.ServiceException; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.StringUtils; -import com.qihang.sys.api.common.DictUtils; -import com.qihang.sys.api.domain.SysDictData; -import com.qihang.sys.api.domain.SysDictType; -import com.qihang.sys.api.mapper.SysDictDataMapper; -import com.qihang.sys.api.mapper.SysDictTypeMapper; -import com.qihang.sys.api.service.ISysDictTypeService; +import cn.qihangerp.sys.mapper.SysDictDataMapper; +import cn.qihangerp.sys.mapper.SysDictTypeMapper; +import cn.qihangerp.sys.service.ISysDictTypeService; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.sys.common.DictUtils; +import cn.qihangerp.sys.domain.SysDictData; +import cn.qihangerp.sys.domain.SysDictType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysMenuServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysMenuServiceImpl.java similarity index 56% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysMenuServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysMenuServiceImpl.java index 7ef9db5e..cb4e69a5 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysMenuServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysMenuServiceImpl.java @@ -1,33 +1,78 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.constant.Constants; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.SecurityUtils; -import com.qihang.security.vo.MetaVo; -import com.qihang.security.vo.RouterVo; -import com.qihang.sys.api.domain.SysMenu; -import com.qihang.sys.api.service.SysMenuService; -import com.qihang.sys.api.mapper.SysMenuMapper; -import lombok.AllArgsConstructor; + + +import cn.qihangerp.sys.domain.SysMenu; +import cn.qihangerp.sys.domain.SysRole; +import cn.qihangerp.sys.domain.vo.TreeSelect; +import cn.qihangerp.sys.mapper.SysMenuMapper; +import cn.qihangerp.sys.mapper.SysRoleMapper; +import cn.qihangerp.sys.mapper.SysRoleMenuMapper; +import cn.qihangerp.sys.service.ISysMenuService; +import cn.qihangerp.common.constant.Constants; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.vo.MetaVo; +import cn.qihangerp.security.vo.RouterVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** -* @author TW -* @description 针对表【sys_menu(菜单权限表)】的数据库操作Service实现 -* @createDate 2024-05-15 10:14:01 -*/ -@AllArgsConstructor + * 菜单 业务层处理 + * + * @author qihang + */ @Service -public class SysMenuServiceImpl extends ServiceImpl - implements SysMenuService{ +public class SysMenuServiceImpl implements ISysMenuService +{ + public static final String PREMISSION_STRING = "perms[\"{0}\"]"; - private final SysMenuMapper menuMapper; + @Autowired + private SysMenuMapper menuMapper; + @Autowired + private SysRoleMapper roleMapper; + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + @Override + public List selectMenuList(Long userId) + { + return selectMenuList(new SysMenu(), userId); + } + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + @Override + public List selectMenuList(SysMenu menu, Long userId) + { + List menuList = null; + // 管理员显示所有菜单信息 + if (SysUser.isAdmin(userId)) + { + menuList = menuMapper.selectMenuList(menu); + } + else + { + menu.getParams().put("userId", userId); + menuList = menuMapper.selectMenuListByUserId(menu); + } + return menuList; + } /** * 根据用户ID查询权限 @@ -50,6 +95,69 @@ public class SysMenuServiceImpl extends ServiceImpl return permsSet; } + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByRoleId(Long roleId) + { + List perms = menuMapper.selectMenuPermsByRoleId(roleId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户名称 + * @return 菜单列表 + */ + @Override + public List selectMenuTreeByUserId(Long userId) + { + List menus = null; + + if (isAdmin(userId)) + { + menus = menuMapper.selectMenuTreeAll(); + } + else + { + menus = menuMapper.selectMenuTreeByUserId(userId); + } +// menus = menuMapper.selectMenuTreeAll(); + return getChildPerms(menus, 0); + } + private static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + @Override + public List selectMenuListByRoleId(Long roleId) + { + SysRole role = roleMapper.selectRoleById(roleId); + return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); + } + /** * 构建前端路由所需要的菜单 * @@ -108,11 +216,133 @@ public class SysMenuServiceImpl extends ServiceImpl return routers; } + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ @Override - public boolean checkMenuNameUnique(SysMenu menu) { + public List buildMenuTree(List menus) + { + List returnList = new ArrayList(); + List tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList()); + for (Iterator iterator = menus.iterator(); iterator.hasNext();) + { + SysMenu menu = (SysMenu) iterator.next(); + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(menu.getParentId())) + { + recursionFn(menus, menu); + returnList.add(menu); + } + } + if (returnList.isEmpty()) + { + returnList = menus; + } + return returnList; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + @Override + public List buildMenuTreeSelect(List menus) + { + List menuTrees = buildMenuTree(menus); + return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + @Override + public SysMenu selectMenuById(Long menuId) + { + return menuMapper.selectMenuById(menuId); + } + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean hasChildByMenuId(Long menuId) + { + int result = menuMapper.hasChildByMenuId(menuId); + return result > 0; + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ +// @Override +// public boolean checkMenuExistRole(Long menuId) +// { +// int result = roleMenuMapper.checkMenuExistRole(menuId); +// return result > 0; +// } + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int insertMenu(SysMenu menu) + { + return menuMapper.insertMenu(menu); + } + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int updateMenu(SysMenu menu) + { + return menuMapper.updateMenu(menu); + } + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int deleteMenuById(Long menuId) + { + return menuMapper.deleteMenuById(menuId); + } + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public boolean checkMenuNameUnique(SysMenu menu) + { Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); - List sysMenus = menuMapper.selectList(new LambdaQueryWrapper().eq(SysMenu::getParentId, menu.getParentId()).eq(SysMenu::getMenuName, menu.getMenuName())); - if (StringUtils.isNotNull(sysMenus) && sysMenus.size()>0&&sysMenus.get(0).getMenuId().longValue() != menuId.longValue()) + SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -120,38 +350,33 @@ public class SysMenuServiceImpl extends ServiceImpl } /** - * 获取组件信息 + * 查询菜单使用数量 * - * @param menu 菜单信息 - * @return 组件信息 + * @param menuId 菜单ID + * @return 结果 */ - public String getComponent(SysMenu menu) + @Override + public boolean checkMenuExistRole(Long menuId) { - String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) - { - component = menu.getComponent(); - } - else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { - component = UserConstants.INNER_LINK; - } - else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) - { - component = UserConstants.PARENT_VIEW; - } - return component; + int result = roleMenuMapper.checkMenuExistRole(menuId); + return result > 0; } /** - * 是否为parent_view组件 + * 获取路由名称 * * @param menu 菜单信息 - * @return 结果 + * @return 路由名称 */ - public boolean isParentView(SysMenu menu) + public String getRouteName(SysMenu menu) { - return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); + String routerName = StringUtils.capitalize(menu.getPath()); + // 非外链并且是一级目录（类型为目录） + if (isMenuFrame(menu)) + { + routerName = StringUtils.EMPTY; + } + return routerName; } /** @@ -183,43 +408,27 @@ public class SysMenuServiceImpl extends ServiceImpl } /** - * 是否为内链组件 + * 获取组件信息 * * @param menu 菜单信息 - * @return 结果 + * @return 组件信息 */ - public boolean isInnerLink(SysMenu menu) + public String getComponent(SysMenu menu) { - return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); - } - - /** - * 内链域名特殊字符替换 - * - * @return 替换后的内链域名 - */ - public String innerLinkReplaceEach(String path) - { - return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." }, - new String[] { "", "", "", "/" }); - } - - - /** - * 获取路由名称 - * - * @param menu 菜单信息 - * @return 路由名称 - */ - public String getRouteName(SysMenu menu) - { - String routerName = StringUtils.capitalize(menu.getPath()); - // 非外链并且是一级目录（类型为目录） - if (isMenuFrame(menu)) + String component = UserConstants.LAYOUT; + if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) { - routerName = StringUtils.EMPTY; + component = menu.getComponent(); } - return routerName; + else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) + { + component = UserConstants.INNER_LINK; + } + else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) + { + component = UserConstants.PARENT_VIEW; + } + return component; } /** @@ -234,22 +443,35 @@ public class SysMenuServiceImpl extends ServiceImpl && menu.getIsFrame().equals(UserConstants.NO_FRAME); } - @Override - public List selectMenuTreeByUserId(Long userId) + /** + * 是否为内链组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isInnerLink(SysMenu menu) { - List menus = null; - if (SecurityUtils.isAdmin(userId)) - { - menus = menuMapper.selectMenuTreeAll(); - } - else - { -// menus = menuMapper.selectMenuTreeByUserId(userId); - menus = menuMapper.selectMenuTreeAll(); - } - return getChildPerms(menus, 0); + return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); } + /** + * 是否为parent_view组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isParentView(SysMenu menu) + { + return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); + } + + /** + * 根据父节点的ID获取所有子节点 + * + * @param list 分类表 + * @param parentId 传入的父节点ID + * @return String + */ public List getChildPerms(List list, int parentId) { List returnList = new ArrayList(); @@ -285,6 +507,7 @@ public class SysMenuServiceImpl extends ServiceImpl } } } + /** * 得到子节点列表 */ @@ -311,8 +534,14 @@ public class SysMenuServiceImpl extends ServiceImpl return getChildList(list, t).size() > 0; } + /** + * 内链域名特殊字符替换 + * + * @return 替换后的内链域名 + */ + public String innerLinkReplaceEach(String path) + { + return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." }, + new String[] { "", "", "", "/" }); + } } - - - - diff --git a/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysRoleServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysRoleServiceImpl.java new file mode 100644 index 00000000..f84aaf68 --- /dev/null +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,419 @@ +package cn.qihangerp.sys.service.impl; + + + +import cn.qihangerp.sys.domain.SysRole; +import cn.qihangerp.sys.domain.SysRoleMenu; +import cn.qihangerp.sys.domain.SysUserRole; +import cn.qihangerp.sys.mapper.SysRoleMapper; +import cn.qihangerp.sys.mapper.SysRoleMenuMapper; +import cn.qihangerp.sys.mapper.SysUserRoleMapper; +import cn.qihangerp.sys.service.ISysRoleService; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.SpringUtils; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.entity.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * 角色 业务层处理 + * + * @author qihang + */ +@Service +public class SysRoleServiceImpl implements ISysRoleService +{ + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + +// @Autowired +// private SysRoleDeptMapper roleDeptMapper; + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + @Override + public List selectRoleList(SysRole role) + { + return roleMapper.selectRoleList(role); + } + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesByUserId(Long userId) + { + List userRoles = roleMapper.selectRolePermissionByUserId(userId); + List roles = selectRoleAll(); + for (SysRole role : roles) + { + for (SysRole userRole : userRoles) + { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) + { + role.setFlag(true); + break; + } + } + } + return roles; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectRolePermissionByUserId(Long userId) + { + List perms = roleMapper.selectRolePermissionByUserId(userId); + Set permsSet = new HashSet<>(); + for (SysRole perm : perms) + { + if (StringUtils.isNotNull(perm)) + { + permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); + } + } + return permsSet; + } + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + @Override + public List selectRoleAll() + { +// return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); + return this.selectRoleList(new SysRole()); + } + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + @Override + public List selectRoleListByUserId(Long userId) + { + return roleMapper.selectRoleListByUserId(userId); + } + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + @Override + public SysRole selectRoleById(Long roleId) + { + return roleMapper.selectRoleById(roleId); + } + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleNameUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleKeyUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + @Override + public void checkRoleAllowed(SysRole role) + { + if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员角色"); + } + } + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + @Override + public void checkRoleDataScope(Long roleId,Long userId) + { + if (!SysUser.isAdmin(userId)) + { + SysRole role = new SysRole(); + role.setRoleId(roleId); + List roles = SpringUtils.getAopProxy(this).selectRoleList(role); + if (StringUtils.isEmpty(roles)) + { + throw new ServiceException("没有权限访问角色数据！"); + } + } + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public int countUserRoleByRoleId(Long roleId) + { + return userRoleMapper.countUserRoleByRoleId(roleId); + } + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int insertRole(SysRole role) + { + // 新增角色信息 + roleMapper.insertRole(role); + return insertRoleMenu(role); + } + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int updateRole(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); + return insertRoleMenu(role); + } + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int updateRoleStatus(SysRole role) + { + return roleMapper.updateRole(role); + } + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int authDataScope(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与部门关联 +// roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); + // 新增角色和部门信息（数据权限） + return insertRoleDept(role); + } + + /** + * 新增角色菜单信息 + * + * @param role 角色对象 + */ + public int insertRoleMenu(SysRole role) + { + int rows = 1; + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long menuId : role.getMenuIds()) + { + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(role.getRoleId()); + rm.setMenuId(menuId); + list.add(rm); + } + if (list.size() > 0) + { + rows = roleMenuMapper.batchRoleMenu(list); + } + return rows; + } + + /** + * 新增角色部门信息(数据权限) + * + * @param role 角色对象 + */ + public int insertRoleDept(SysRole role) + { + int rows = 1; +// // 新增角色与部门（数据权限）管理 +// List list = new ArrayList(); +// for (Long deptId : role.getDeptIds()) +// { +// SysRoleDept rd = new SysRoleDept(); +// rd.setRoleId(role.getRoleId()); +// rd.setDeptId(deptId); +// list.add(rd); +// } +// if (list.size() > 0) +// { +// rows = roleDeptMapper.batchRoleDept(list); +// } + return rows; + } + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + @Transactional + public int deleteRoleById(Long roleId) + { + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(roleId); + // 删除角色与部门关联 +// roleDeptMapper.deleteRoleDeptByRoleId(roleId); + return roleMapper.deleteRoleById(roleId); + } + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + @Override + @Transactional + public int deleteRoleByIds(Long[] roleIds,Long userId) + { + for (Long roleId : roleIds) + { + checkRoleAllowed(new SysRole(roleId)); + checkRoleDataScope(roleId,userId); + SysRole role = selectRoleById(roleId); + if (countUserRoleByRoleId(roleId) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); + } + } + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenu(roleIds); + // 删除角色与部门关联 +// roleDeptMapper.deleteRoleDept(roleIds); + return roleMapper.deleteRoleByIds(roleIds); + } + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + @Override + public int deleteAuthUser(SysUserRole userRole) + { + return userRoleMapper.deleteUserRoleInfo(userRole); + } + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + @Override + public int deleteAuthUsers(Long roleId, Long[] userIds) + { + return userRoleMapper.deleteUserRoleInfos(roleId, userIds); + } + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要授权的用户数据ID + * @return 结果 + */ + @Override + public int insertAuthUsers(Long roleId, Long[] userIds) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long userId : userIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + return userRoleMapper.batchUserRole(list); + } +} diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskLogsServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskLogsServiceImpl.java similarity index 72% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskLogsServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskLogsServiceImpl.java index 8be43db8..49a3ef96 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskLogsServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskLogsServiceImpl.java @@ -1,14 +1,13 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; +import cn.qihangerp.sys.mapper.SysTaskLogsMapper; +import cn.qihangerp.sys.service.SysTaskLogsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.sys.api.domain.SysTask; -import com.qihang.sys.api.domain.SysTaskLogs; -import com.qihang.sys.api.service.SysTaskLogsService; -import com.qihang.sys.api.mapper.SysTaskLogsMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.sys.domain.SysTaskLogs; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service public class SysTaskLogsServiceImpl extends ServiceImpl - implements SysTaskLogsService{ + implements SysTaskLogsService { private final SysTaskLogsMapper mapper; @Override diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskServiceImpl.java similarity index 74% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskServiceImpl.java index b44c4419..4b83a882 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysTaskServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysTaskServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; +import cn.qihangerp.sys.mapper.SysTaskMapper; +import cn.qihangerp.sys.service.SysTaskService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.common.PageQuery; -import com.qihang.common.common.PageResult; -import com.qihang.sys.api.domain.SysTask; -import com.qihang.sys.api.service.SysTaskService; -import com.qihang.sys.api.mapper.SysTaskMapper; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.sys.domain.SysTask; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service public class SysTaskServiceImpl extends ServiceImpl - implements SysTaskService{ + implements SysTaskService { private final SysTaskMapper mapper; @Override diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysUserServiceImpl.java b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysUserServiceImpl.java similarity index 94% rename from sys-api/src/main/java/com/qihang/sys/api/service/impl/SysUserServiceImpl.java rename to sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysUserServiceImpl.java index b4338132..2de4c1a8 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysUserServiceImpl.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/service/impl/SysUserServiceImpl.java @@ -1,13 +1,13 @@ -package com.qihang.sys.api.service.impl; +package cn.qihangerp.sys.service.impl; -import com.qihang.common.common.ServiceException; -import com.qihang.common.constant.UserConstants; -import com.qihang.common.utils.SpringUtils; -import com.qihang.common.utils.StringUtils; -import com.qihang.security.common.SecurityUtils; -import com.qihang.sys.api.mapper.SysUserMapper; -import com.qihang.security.entity.SysUser; -import com.qihang.security.service.ISysUserService; +import cn.qihangerp.sys.mapper.SysUserMapper; +import cn.qihangerp.common.common.ServiceException; +import cn.qihangerp.common.constant.UserConstants; +import cn.qihangerp.common.utils.SpringUtils; +import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.security.common.SecurityUtils; +import cn.qihangerp.security.entity.SysUser; +import cn.qihangerp.security.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/DateUtils.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/DateUtils.java similarity index 99% rename from sys-api/src/main/java/com/qihang/sys/api/utils/DateUtils.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/DateUtils.java index ab7b0876..f9a80fba 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/utils/DateUtils.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.qihang.sys.api.utils; +package cn.qihangerp.sys.utils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/common/src/main/java/com/qihang/common/config/FastJson2JsonRedisSerializer.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/FastJson2JsonRedisSerializer.java similarity index 97% rename from common/src/main/java/com/qihang/common/config/FastJson2JsonRedisSerializer.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/FastJson2JsonRedisSerializer.java index f820b393..7e2c00fb 100644 --- a/common/src/main/java/com/qihang/common/config/FastJson2JsonRedisSerializer.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/utils/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.qihang.common.config; +package cn.qihangerp.sys.utils; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; diff --git a/common/src/main/java/com/qihang/common/utils/IdUtils.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/IdUtils.java similarity index 96% rename from common/src/main/java/com/qihang/common/utils/IdUtils.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/IdUtils.java index 3063ef19..0feaa265 100644 --- a/common/src/main/java/com/qihang/common/utils/IdUtils.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/utils/IdUtils.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils; +package cn.qihangerp.sys.utils; /** * ID生成器工具类 diff --git a/common/src/main/java/com/qihang/common/utils/UUID.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/UUID.java similarity index 99% rename from common/src/main/java/com/qihang/common/utils/UUID.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/UUID.java index 2030a7c4..a0f15d7b 100644 --- a/common/src/main/java/com/qihang/common/utils/UUID.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/utils/UUID.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils; +package cn.qihangerp.sys.utils; diff --git a/common/src/main/java/com/qihang/common/utils/http/HttpHelper.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/http/HttpHelper.java similarity index 97% rename from common/src/main/java/com/qihang/common/utils/http/HttpHelper.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/http/HttpHelper.java index 4cf370df..9f0524e4 100644 --- a/common/src/main/java/com/qihang/common/utils/http/HttpHelper.java +++ b/sys-api/src/main/java/cn/qihangerp/sys/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.qihang.common.utils.http; +package cn.qihangerp.sys.utils.http; import jakarta.servlet.ServletRequest; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/ip/AddressUtils.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/ip/AddressUtils.java similarity index 100% rename from sys-api/src/main/java/com/qihang/sys/api/utils/ip/AddressUtils.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/ip/AddressUtils.java diff --git a/sys-api/src/main/java/com/qihang/sys/api/utils/ip/IpUtils.java b/sys-api/src/main/java/cn/qihangerp/sys/utils/ip/IpUtils.java similarity index 100% rename from sys-api/src/main/java/com/qihang/sys/api/utils/ip/IpUtils.java rename to sys-api/src/main/java/cn/qihangerp/sys/utils/ip/IpUtils.java diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysMenu.java b/sys-api/src/main/java/com/qihang/sys/api/domain/SysMenu.java deleted file mode 100644 index c2a62613..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysMenu.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.qihang.sys.api.domain; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; - -/** - * 菜单权限表 - * @TableName sys_menu - */ -@Data -public class SysMenu implements Serializable { - /** - * 菜单ID - */ - private Long menuId; - - /** - * 菜单名称 - */ - private String menuName; - - /** - * 系统id（oms用在oms系统） - */ - private String systemId; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 显示顺序 - */ - private Integer orderNum; - - /** - * 路由地址 - */ - private String path; - - /** - * 组件路径 - */ - private String component; - - /** - * 路由参数 - */ - private String query; - - /** - * 是否为外链（0是 1否） - */ - private Integer isFrame; - - /** - * 是否缓存（0缓存 1不缓存） - */ - private String isCache; - - /** - * 菜单类型（M目录 C菜单 F按钮） - */ - private String menuType; - - /** - * 菜单状态（0显示 1隐藏） - */ - private String visible; - - /** - * 菜单状态（0正常 1停用） - */ - private String status; - - /** - * 权限标识 - */ - private String perms; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - private String updateTime; - - /** - * 备注 - */ - private String remark; - - @TableField(exist = false) - private List children = new ArrayList(); - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/SysRole.java b/sys-api/src/main/java/com/qihang/sys/api/domain/SysRole.java deleted file mode 100644 index 344c5153..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/SysRole.java +++ /dev/null @@ -1,352 +0,0 @@ -package com.qihang.sys.api.domain; - -import java.io.Serializable; -import java.util.Date; - -/** - * 角色信息表 - * @TableName sys_role - */ -public class SysRole implements Serializable { - /** - * 角色ID - */ - private Long roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 角色权限字符串 - */ - private String roleKey; - - /** - * 显示顺序 - */ - private Integer roleSort; - - /** - * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） - */ - private String dataScope; - - /** - * 菜单树选择项是否关联显示 - */ - private Integer menuCheckStrictly; - - /** - * 部门树选择项是否关联显示 - */ - private Integer deptCheckStrictly; - - /** - * 角色状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private String delFlag; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 备注 - */ - private String remark; - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - public Long getRoleId() { - return roleId; - } - - /** - * 角色ID - */ - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - /** - * 角色名称 - */ - public String getRoleName() { - return roleName; - } - - /** - * 角色名称 - */ - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - /** - * 角色权限字符串 - */ - public String getRoleKey() { - return roleKey; - } - - /** - * 角色权限字符串 - */ - public void setRoleKey(String roleKey) { - this.roleKey = roleKey; - } - - /** - * 显示顺序 - */ - public Integer getRoleSort() { - return roleSort; - } - - /** - * 显示顺序 - */ - public void setRoleSort(Integer roleSort) { - this.roleSort = roleSort; - } - - /** - * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） - */ - public String getDataScope() { - return dataScope; - } - - /** - * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） - */ - public void setDataScope(String dataScope) { - this.dataScope = dataScope; - } - - /** - * 菜单树选择项是否关联显示 - */ - public Integer getMenuCheckStrictly() { - return menuCheckStrictly; - } - - /** - * 菜单树选择项是否关联显示 - */ - public void setMenuCheckStrictly(Integer menuCheckStrictly) { - this.menuCheckStrictly = menuCheckStrictly; - } - - /** - * 部门树选择项是否关联显示 - */ - public Integer getDeptCheckStrictly() { - return deptCheckStrictly; - } - - /** - * 部门树选择项是否关联显示 - */ - public void setDeptCheckStrictly(Integer deptCheckStrictly) { - this.deptCheckStrictly = deptCheckStrictly; - } - - /** - * 角色状态（0正常 1停用） - */ - public String getStatus() { - return status; - } - - /** - * 角色状态（0正常 1停用） - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 删除标志（0代表存在 2代表删除） - */ - public String getDelFlag() { - return delFlag; - } - - /** - * 删除标志（0代表存在 2代表删除） - */ - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - /** - * 创建者 - */ - public String getCreateBy() { - return createBy; - } - - /** - * 创建者 - */ - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - /** - * 创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 更新者 - */ - public String getUpdateBy() { - return updateBy; - } - - /** - * 更新者 - */ - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - /** - * 更新时间 - */ - public Date getUpdateTime() { - return updateTime; - } - - /** - * 更新时间 - */ - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - /** - * 备注 - */ - public String getRemark() { - return remark; - } - - /** - * 备注 - */ - public void setRemark(String remark) { - this.remark = remark; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SysRole other = (SysRole) that; - return (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId())) - && (this.getRoleName() == null ? other.getRoleName() == null : this.getRoleName().equals(other.getRoleName())) - && (this.getRoleKey() == null ? other.getRoleKey() == null : this.getRoleKey().equals(other.getRoleKey())) - && (this.getRoleSort() == null ? other.getRoleSort() == null : this.getRoleSort().equals(other.getRoleSort())) - && (this.getDataScope() == null ? other.getDataScope() == null : this.getDataScope().equals(other.getDataScope())) - && (this.getMenuCheckStrictly() == null ? other.getMenuCheckStrictly() == null : this.getMenuCheckStrictly().equals(other.getMenuCheckStrictly())) - && (this.getDeptCheckStrictly() == null ? other.getDeptCheckStrictly() == null : this.getDeptCheckStrictly().equals(other.getDeptCheckStrictly())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getDelFlag() == null ? other.getDelFlag() == null : this.getDelFlag().equals(other.getDelFlag())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) - && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode()); - result = prime * result + ((getRoleName() == null) ? 0 : getRoleName().hashCode()); - result = prime * result + ((getRoleKey() == null) ? 0 : getRoleKey().hashCode()); - result = prime * result + ((getRoleSort() == null) ? 0 : getRoleSort().hashCode()); - result = prime * result + ((getDataScope() == null) ? 0 : getDataScope().hashCode()); - result = prime * result + ((getMenuCheckStrictly() == null) ? 0 : getMenuCheckStrictly().hashCode()); - result = prime * result + ((getDeptCheckStrictly() == null) ? 0 : getDeptCheckStrictly().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getDelFlag() == null) ? 0 : getDelFlag().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", roleId=").append(roleId); - sb.append(", roleName=").append(roleName); - sb.append(", roleKey=").append(roleKey); - sb.append(", roleSort=").append(roleSort); - sb.append(", dataScope=").append(dataScope); - sb.append(", menuCheckStrictly=").append(menuCheckStrictly); - sb.append(", deptCheckStrictly=").append(deptCheckStrictly); - sb.append(", status=").append(status); - sb.append(", delFlag=").append(delFlag); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", remark=").append(remark); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenuMetaVo.java b/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenuMetaVo.java deleted file mode 100644 index 7244bd89..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/domain/vo/MenuMetaVo.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.qihang.sys.api.domain.vo; - -public class MenuMetaVo { -} diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysMenuMapper.java b/sys-api/src/main/java/com/qihang/sys/api/mapper/SysMenuMapper.java deleted file mode 100644 index 23a10bb6..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysMenuMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.qihang.sys.api.mapper; - -import com.qihang.sys.api.domain.SysMenu; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - -/** -* @author TW -* @description 针对表【sys_menu(菜单权限表)】的数据库操作Mapper -* @createDate 2024-05-15 10:14:01 -* @Entity com.qihang.sys.api.domain.SysMenu -*/ -public interface SysMenuMapper extends BaseMapper { - List selectMenuTreeAll(); - List selectMenuTreeByUserId(Long userId); - - List selectMenuPermsByUserId(Long userId); -} - - - - diff --git a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysRoleMapper.java b/sys-api/src/main/java/com/qihang/sys/api/mapper/SysRoleMapper.java deleted file mode 100644 index 9eb0225a..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/mapper/SysRoleMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.qihang.sys.api.mapper; - -import com.qihang.sys.api.domain.SysRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - -/** -* @author TW -* @description 针对表【sys_role(角色信息表)】的数据库操作Mapper -* @createDate 2024-03-15 16:55:10 -* @Entity com.qihang.sys.api.domain.SysRole -*/ -public interface SysRoleMapper extends BaseMapper { - List selectRolePermissionByUserId(Long userId); -} - - - - diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/SysMenuService.java b/sys-api/src/main/java/com/qihang/sys/api/service/SysMenuService.java deleted file mode 100644 index 59345c61..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/service/SysMenuService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.qihang.sys.api.service; - -import com.qihang.security.vo.RouterVo; -import com.qihang.sys.api.domain.SysMenu; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; -import java.util.Set; - -/** -* @author TW -* @description 针对表【sys_menu(菜单权限表)】的数据库操作Service -* @createDate 2024-05-15 10:14:01 -*/ -public interface SysMenuService extends IService { - Set selectMenuPermsByUserId(Long userId); - List selectMenuTreeByUserId(Long userId); - List buildMenus(List menus); - - boolean checkMenuNameUnique(SysMenu menu); -} diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/SysRoleService.java b/sys-api/src/main/java/com/qihang/sys/api/service/SysRoleService.java deleted file mode 100644 index 1e7f2fb0..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/service/SysRoleService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.qihang.sys.api.service; - -import com.qihang.sys.api.domain.SysRole; -import com.baomidou.mybatisplus.extension.service.IService; -import com.qihang.sys.api.mapper.SysRoleMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import java.util.Set; - -/** -* @author TW -* @description 针对表【sys_role(角色信息表)】的数据库操作Service -* @createDate 2024-03-15 16:55:10 -*/ -public interface SysRoleService extends IService { - Set selectRolePermissionByUserId(Long userId); -} diff --git a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysRoleServiceImpl.java b/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysRoleServiceImpl.java deleted file mode 100644 index 4f0d29cb..00000000 --- a/sys-api/src/main/java/com/qihang/sys/api/service/impl/SysRoleServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.qihang.sys.api.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.common.utils.StringUtils; -import com.qihang.sys.api.domain.SysRole; -import com.qihang.sys.api.service.SysRoleService; -import com.qihang.sys.api.mapper.SysRoleMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** -* @author TW -* @description 针对表【sys_role(角色信息表)】的数据库操作Service实现 -* @createDate 2024-03-15 16:55:10 -*/ -@AllArgsConstructor -@Service -public class SysRoleServiceImpl extends ServiceImpl - implements SysRoleService{ - private final SysRoleMapper roleMapper; - - @Override - public Set selectRolePermissionByUserId(Long userId) { - List perms = roleMapper.selectRolePermissionByUserId(userId); - Set permsSet = new HashSet<>(); - for (SysRole perm : perms) - { - if (StringUtils.isNotNull(perm)) - { - permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); - } - } - return permsSet; - } -} - - - - diff --git a/sys-api/src/main/resources/application.yaml b/sys-api/src/main/resources/application.yaml index 5d3dc7aa..ff12d148 100644 --- a/sys-api/src/main/resources/application.yaml +++ b/sys-api/src/main/resources/application.yaml @@ -15,7 +15,7 @@ spring: # serverAddr: 127.0.0.1:8848 discovery: server-addr: 127.0.0.1:8848 - usename: nacos + username: nacos passowrd: nacos data: # redis 配置 @@ -52,7 +52,7 @@ spring: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.qihang.sys.api.domain;com.qihang.security.entity; + type-aliases-package: cn.qihangerp.sys.domain;cn.qihangerp.security.entity; configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 #mybatis: diff --git a/sys-api/src/main/resources/mapper/SysDeptMapper.xml b/sys-api/src/main/resources/mapper/SysDeptMapper.xml new file mode 100644 index 00000000..5ddc13bc --- /dev/null +++ b/sys-api/src/main/resources/mapper/SysDeptMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + current_timestamp() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = current_timestamp() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/sys-api/src/main/resources/mapper/SysMenuMapper.xml b/sys-api/src/main/resources/mapper/SysMenuMapper.xml index d1c1679a..457913b1 100644 --- a/sys-api/src/main/resources/mapper/SysMenuMapper.xml +++ b/sys-api/src/main/resources/mapper/SysMenuMapper.xml @@ -1,65 +1,202 @@ - + - + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - menu_id,menu_name,system_id, - parent_id,order_num,path, - component,query,is_frame, - is_cache,menu_type,visible, - status,perms,icon, - create_by,create_time,update_by, - update_time,remark + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + from sys_menu + + + + + + + + + + + + - + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = current_timestamp() + + where menu_id = #{menuId} + - - + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + current_timestamp() + ) + + + + delete from sys_menu where menu_id = #{menuId} + - + \ No newline at end of file diff --git a/sys-api/src/main/resources/mapper/SysRoleMapper.xml b/sys-api/src/main/resources/mapper/SysRoleMapper.xml index 35d94ad6..7cda48b2 100644 --- a/sys-api/src/main/resources/mapper/SysRoleMapper.xml +++ b/sys-api/src/main/resources/mapper/SysRoleMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/sys-api/src/main/resources/mapper/SysRoleMenuMapper.xml b/sys-api/src/main/resources/mapper/SysRoleMenuMapper.xml new file mode 100644 index 00000000..f5f8077c --- /dev/null +++ b/sys-api/src/main/resources/mapper/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/sys-api/src/main/resources/mapper/SysTaskLogsMapper.xml b/sys-api/src/main/resources/mapper/SysTaskLogsMapper.xml index f0ff0728..7fc3bf79 100644 --- a/sys-api/src/main/resources/mapper/SysTaskLogsMapper.xml +++ b/sys-api/src/main/resources/mapper/SysTaskLogsMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/sys-api/src/main/resources/mapper/SysTaskMapper.xml b/sys-api/src/main/resources/mapper/SysTaskMapper.xml index 7c9460df..284d2b8e 100644 --- a/sys-api/src/main/resources/mapper/SysTaskMapper.xml +++ b/sys-api/src/main/resources/mapper/SysTaskMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/sys-api/src/main/resources/mapper/SysUserRoleMapper.xml b/sys-api/src/main/resources/mapper/SysUserRoleMapper.xml new file mode 100644 index 00000000..55506b81 --- /dev/null +++ b/sys-api/src/main/resources/mapper/SysUserRoleMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + + \ No newline at end of file diff --git a/sys-api/src/main/resources/mapper/system/SysDictDataMapper.xml b/sys-api/src/main/resources/mapper/system/SysDictDataMapper.xml index dfb0ba7a..f43cb8a0 100644 --- a/sys-api/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/sys-api/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sys-api/src/main/resources/mapper/system/SysDictTypeMapper.xml b/sys-api/src/main/resources/mapper/system/SysDictTypeMapper.xml index 28503a90..8e993f8e 100644 --- a/sys-api/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/sys-api/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/sys-api/src/main/resources/mapper/user/SysUserMapper.xml b/sys-api/src/main/resources/mapper/user/SysUserMapper.xml index 724626eb..6174f568 100644 --- a/sys-api/src/main/resources/mapper/user/SysUserMapper.xml +++ b/sys-api/src/main/resources/mapper/user/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/vue/src/api/goods/brand.js b/vue/src/api/goods/brand.js index dac3b96c..eade2f06 100644 --- a/vue/src/api/goods/brand.js +++ b/vue/src/api/goods/brand.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品品牌列表 export function listBrand(query) { return request({ - url: '/goods/brand/list', + url: '/api/oms-api/goods_brand/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listBrand(query) { // 查询商品品牌详细 export function getBrand(id) { return request({ - url: '/goods/brand/' + id, + url: '/api/oms-api/goods_brand/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getBrand(id) { // 新增商品品牌 export function addBrand(data) { return request({ - url: '/goods/brand', + url: '/api/oms-api/goods_brand', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addBrand(data) { // 修改商品品牌 export function updateBrand(data) { return request({ - url: '/goods/brand', + url: '/api/oms-api/goods_brand', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateBrand(data) { // 删除商品品牌 export function delBrand(id) { return request({ - url: '/goods/brand/' + id, + url: '/api/oms-api/goods_brand/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/category.js b/vue/src/api/goods/category.js index 551a043a..b5d2419f 100644 --- a/vue/src/api/goods/category.js +++ b/vue/src/api/goods/category.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类列表 export function listCategory(query) { return request({ - url: '/goods/category/list', + url: '/api/oms-api/goods_category/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategory(query) { // 查询商品分类详细 export function getCategory(id) { return request({ - url: '/goods/category/' + id, + url: '/api/oms-api/goods_category/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategory(id) { // 新增商品分类 export function addCategory(data) { return request({ - url: '/goods/category', + url: '/api/oms-api/goods_category', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategory(data) { // 修改商品分类 export function updateCategory(data) { return request({ - url: '/goods/category', + url: '/api/oms-api/goods_category', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategory(data) { // 删除商品分类 export function delCategory(id) { return request({ - url: '/goods/category/' + id, + url: '/api/oms-api/goods_category/del/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/categoryAttribute.js b/vue/src/api/goods/categoryAttribute.js index 16eb6c69..58d87974 100644 --- a/vue/src/api/goods/categoryAttribute.js +++ b/vue/src/api/goods/categoryAttribute.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类属性列表 export function listCategoryAttribute(query) { return request({ - url: '/goods/categoryAttribute/list', + url: '/api/oms-api/goods_category/attribute_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategoryAttribute(query) { // 查询商品分类属性详细 export function getCategoryAttribute(id) { return request({ - url: '/goods/categoryAttribute/' + id, + url: '/api/oms-api/goods_category/attribute/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategoryAttribute(id) { // 新增商品分类属性 export function addCategoryAttribute(data) { return request({ - url: '/goods/categoryAttribute', + url: '/api/oms-api/goods_category/attribute_add', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategoryAttribute(data) { // 修改商品分类属性 export function updateCategoryAttribute(data) { return request({ - url: '/goods/categoryAttribute', + url: '/api/oms-api/goods_category/attribute', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategoryAttribute(data) { // 删除商品分类属性 export function delCategoryAttribute(id) { return request({ - url: '/goods/categoryAttribute/' + id, + url: '/api/oms-api/goods_category/attribute/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/categoryAttributeValue.js b/vue/src/api/goods/categoryAttributeValue.js index 3df58a5f..b6540071 100644 --- a/vue/src/api/goods/categoryAttributeValue.js +++ b/vue/src/api/goods/categoryAttributeValue.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品分类属性值列表 export function listCategoryAttributeValue(query) { return request({ - url: '/goods/categoryAttributeValue/list', + url: '/api/oms-api/goods_category/attribute_value_list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCategoryAttributeValue(query) { // 查询商品分类属性值详细 export function getCategoryAttributeValue(id) { return request({ - url: '/goods/categoryAttributeValue/' + id, + url: '/api/oms-api/goods_category/attribute_value/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCategoryAttributeValue(id) { // 新增商品分类属性值 export function addCategoryAttributeValue(data) { return request({ - url: '/goods/categoryAttributeValue', + url: '/api/oms-api/goods_category/attribute_value', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCategoryAttributeValue(data) { // 修改商品分类属性值 export function updateCategoryAttributeValue(data) { return request({ - url: '/goods/categoryAttributeValue', + url: '/api/oms-api/goods_category/attribute_value', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCategoryAttributeValue(data) { // 删除商品分类属性值 export function delCategoryAttributeValue(id) { return request({ - url: '/goods/categoryAttributeValue/' + id, + url: '/api/oms-api/goods_category/attribute_value/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/goods.js b/vue/src/api/goods/goods.js index 080aa19d..54e4e175 100644 --- a/vue/src/api/goods/goods.js +++ b/vue/src/api/goods/goods.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品管理列表 export function listGoods(query) { return request({ - url: '/goods/goods/list', + url: '/api/oms-api/goods/list', method: 'get', params: query }) @@ -12,16 +12,15 @@ export function listGoods(query) { // 查询商品规格列表 export function searchSku(query) { return request({ - url: '/goods/goods/searchSku', + url: '/api/oms-api/goods/searchSku', method: 'get', params: query }) } - // 查询商品管理详细 export function getGoods(id) { return request({ - url: '/goods/goods/' + id, + url: '/api/oms-api/goods/' + id, method: 'get' }) } @@ -29,7 +28,7 @@ export function getGoods(id) { // 新增商品管理 export function addGoods(data) { return request({ - url: '/goods/goods', + url: '/api/oms-api/goods/add', method: 'post', data: data }) @@ -38,7 +37,7 @@ export function addGoods(data) { // 修改商品管理 export function updateGoods(data) { return request({ - url: '/goods/goods', + url: '/api/oms-api/goods', method: 'put', data: data }) @@ -47,7 +46,7 @@ export function updateGoods(data) { // 删除商品管理 export function delGoods(id) { return request({ - url: '/goods/goods/' + id, + url: '/api/oms-api/goods/del/' + id, method: 'delete' }) } diff --git a/vue/src/api/goods/goodsInventory.js b/vue/src/api/goods/goodsInventory.js index df940b09..6571dc33 100644 --- a/vue/src/api/goods/goodsInventory.js +++ b/vue/src/api/goods/goodsInventory.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品库存列表 export function listGoodsInventory(query) { return request({ - url: '/api/goodsInventory/list', + url: '/api/oms-api/goodsInventory/list', method: 'get', params: query }) @@ -12,33 +12,7 @@ export function listGoodsInventory(query) { // 查询商品库存详细 export function getGoodsInventory(id) { return request({ - url: '/api/goodsInventory/' + id, + url: '/api/oms-api/goodsInventory/' + id, method: 'get' }) } - -// 新增商品库存 -export function addGoodsInventory(data) { - return request({ - url: '/api/goodsInventory', - method: 'post', - data: data - }) -} - -// 修改商品库存 -export function updateGoodsInventory(data) { - return request({ - url: '/api/goodsInventory', - method: 'put', - data: data - }) -} - -// 删除商品库存 -export function delGoodsInventory(id) { - return request({ - url: '/api/goodsInventory/' + id, - method: 'delete' - }) -} diff --git a/vue/src/api/goods/supplier.js b/vue/src/api/goods/supplier.js new file mode 100644 index 00000000..93a6e73d --- /dev/null +++ b/vue/src/api/goods/supplier.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询供应商管理列表 +export function listSupplier(query) { + return request({ + url: '/api/oms-api/supplier/list', + method: 'get', + params: query + }) +} + +// 查询供应商管理详细 +export function getSupplier(id) { + return request({ + url: '/api/oms-api/supplier/' + id, + method: 'get' + }) +} + +// 新增供应商管理 +export function addSupplier(data) { + return request({ + url: '/api/oms-api/supplier', + method: 'post', + data: data + }) +} + +// 修改供应商管理 +export function updateSupplier(data) { + return request({ + url: '/api/oms-api/supplier', + method: 'put', + data: data + }) +} + +// 删除供应商管理 +export function delSupplier(id) { + return request({ + url: '/api/oms-api/supplier/' + id, + method: 'delete' + }) +} diff --git a/vue/src/api/offline/goodsSku.js b/vue/src/api/offline/goodsSku.js new file mode 100644 index 00000000..c0ac3bce --- /dev/null +++ b/vue/src/api/offline/goodsSku.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询商品规格库存管理列表 +export function listGoodsSku(query) { + return request({ + url: '/api/oms-api/offline_goods/sku_list', + method: 'get', + params: query + }) +} + +// 查询商品规格库存管理详细 +export function getGoodsSku(id) { + return request({ + url: '/api/oms-api/offline_goods/sku/' + id, + method: 'get' + }) +} + +// 新增商品规格库存管理 +export function addGoodsSku(data) { + return request({ + url: '/api/oms-api/offline_goods/sku', + method: 'post', + data: data + }) +} + +// 修改商品规格库存管理 +export function updateGoodsSku(data) { + return request({ + url: '/api/oms-api/offline_goods/sku', + method: 'put', + data: data + }) +} + +// 删除商品规格库存管理 +export function delGoodsSku(id) { + return request({ + url: '/api/oms-api/offline_goods/sku/' + id, + method: 'delete' + }) +} + +// 查询商品规格列表 +export function searchSku(query) { + return request({ + url: '/api/oms-api/offline_goods/searchSku', + method: 'get', + params: query + }) +} diff --git a/vue/src/api/offline/order.js b/vue/src/api/offline/order.js new file mode 100644 index 00000000..8cc78c55 --- /dev/null +++ b/vue/src/api/offline/order.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 查询店铺订单列表 +export function listOrder(query) { + return request({ + url: '/api/oms-api/offline_order/list', + method: 'get', + params: query + }) +} + +// 查询店铺订单详细 +export function getOrder(id) { + return request({ + url: '/api/oms-api/offline_order/' + id, + method: 'get' + }) +} + +// 新增店铺订单 +export function addOrder(data) { + return request({ + url: '/api/oms-api/offline_order/create', + method: 'post', + data: data + }) +} + +export function pushOms(data) { + return request({ + url: '/api/oms-api/offline_order/push_oms', + method: 'post', + data: data + }) +} diff --git a/vue/src/api/offline/refund.js b/vue/src/api/offline/refund.js new file mode 100644 index 00000000..d77d01d0 --- /dev/null +++ b/vue/src/api/offline/refund.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +// 查询列表 +export function list(query) { + return request({ + url: '/api/oms-api/offline_refund/list', + method: 'get', + params: query + }) +} + + + diff --git a/vue/src/api/offline/ship.js b/vue/src/api/offline/ship.js new file mode 100644 index 00000000..b1576f20 --- /dev/null +++ b/vue/src/api/offline/ship.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 填写物流单号 +export function logisticsUpdate(data) { + return request({ + url: '/api/oms-api/offline_ship/order_logistics', + method: 'post', + data: data + }) +} + +// 批量发货 +export function batchOrderSend(data) { + return request({ + url: '/api/oms-api/offline_ship/order_batch_send', + method: 'post', + data: data + }) +} diff --git a/vue/src/api/offline/shop.js b/vue/src/api/offline/shop.js new file mode 100644 index 00000000..29732d38 --- /dev/null +++ b/vue/src/api/offline/shop.js @@ -0,0 +1,44 @@ +// import request from '@/utils/request' +// +// // 查询店铺列表 +// export function listShop(query) { +// return request({ +// url: '/api/offline-api/shop/list', +// method: 'get', +// params: query +// }) +// } +// +// // 查询店铺详细 +// export function getShop(id) { +// return request({ +// url: '/api/offline-api/shop/' + id, +// method: 'get' +// }) +// } +// +// // 新增店铺 +// export function addShop(data) { +// return request({ +// url: '/api/offline-api/shop', +// method: 'post', +// data: data +// }) +// } +// +// // 修改店铺 +// export function updateShop(data) { +// return request({ +// url: '/api/offline-api/shop', +// method: 'put', +// data: data +// }) +// } +// +// // 删除店铺 +// export function delShop(id) { +// return request({ +// url: '/api/offline-api/shop/' + id, +// method: 'delete' +// }) +// } diff --git a/vue/src/api/system/menu.js b/vue/src/api/system/menu.js index 43236f70..8fad2982 100644 --- a/vue/src/api/system/menu.js +++ b/vue/src/api/system/menu.js @@ -20,7 +20,7 @@ export function getMenu(menuId) { // 查询菜单下拉树结构 export function treeselect() { return request({ - url: '/system/menu/treeselect', + url: '/api/sys-api/system/menu/treeselect', method: 'get' }) } @@ -54,7 +54,7 @@ export function updateMenu(data) { // 删除菜单 export function delMenu(menuId) { return request({ - url: '/system/menu/' + menuId, + url: '/api/sys-api/system/menu/' + menuId, method: 'delete' }) } diff --git a/vue/src/views/dou/goods/index.vue b/vue/src/views/dou/goods/index.vue new file mode 100644 index 00000000..ac9c61dc --- /dev/null +++ b/vue/src/views/dou/goods/index.vue @@ -0,0 +1,315 @@ + + + diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue new file mode 100644 index 00000000..cda5fc8a --- /dev/null +++ b/vue/src/views/dou/order/index.vue @@ -0,0 +1,402 @@ + + + diff --git a/vue/src/views/dou/refund/index.vue b/vue/src/views/dou/refund/index.vue index 6ac56cdf..ad1e3c2e 100644 --- a/vue/src/views/dou/refund/index.vue +++ b/vue/src/views/dou/refund/index.vue @@ -51,7 +51,7 @@ 手动推送售后 + >手动将选中退款推送到售后中心 @@ -184,13 +184,15 @@ export default { title: "", // 是否显示弹出层 open: false, - pullLoading: false, // 查询参数 queryParams: { pageNum: 1, pageSize: 10, refundId: null, - afterSalesType: null + afterSalesType: null, + tid: null, + oid: null, + }, // 表单参数 form: {}, @@ -212,13 +214,14 @@ export default { }; }, created() { - listShop({platform: 6}).then(response => { + listShop({type: 400}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id } this.getList(); }); + // this.getList(); }, methods: { amountFormatter(row, column, cellValue, index) { diff --git a/vue/src/views/goods/brand/index.vue b/vue/src/views/goods/brand/index.vue new file mode 100644 index 00000000..2b967196 --- /dev/null +++ b/vue/src/views/goods/brand/index.vue @@ -0,0 +1,260 @@ + + + diff --git a/vue/src/views/goods/category/categoryAttribute.vue b/vue/src/views/goods/category/categoryAttribute.vue new file mode 100644 index 00000000..fbfa2289 --- /dev/null +++ b/vue/src/views/goods/category/categoryAttribute.vue @@ -0,0 +1,306 @@ + + + diff --git a/vue/src/views/goods/category/categoryAttributeValue.vue b/vue/src/views/goods/category/categoryAttributeValue.vue new file mode 100644 index 00000000..f65dbb08 --- /dev/null +++ b/vue/src/views/goods/category/categoryAttributeValue.vue @@ -0,0 +1,315 @@ + + + diff --git a/vue/src/views/goods/category/index.vue b/vue/src/views/goods/category/index.vue new file mode 100644 index 00000000..4135ac96 --- /dev/null +++ b/vue/src/views/goods/category/index.vue @@ -0,0 +1,363 @@ + + + diff --git a/vue/src/views/goods/create.vue b/vue/src/views/goods/create.vue new file mode 100644 index 00000000..cc451833 --- /dev/null +++ b/vue/src/views/goods/create.vue @@ -0,0 +1,626 @@ + + + + diff --git a/vue/src/views/goods/goodsInventory/index.vue b/vue/src/views/goods/goodsInventory/index.vue new file mode 100644 index 00000000..ac81ab47 --- /dev/null +++ b/vue/src/views/goods/goodsInventory/index.vue @@ -0,0 +1,270 @@ + + + diff --git a/vue/src/views/goods/index.vue b/vue/src/views/goods/index.vue new file mode 100644 index 00000000..84e5d751 --- /dev/null +++ b/vue/src/views/goods/index.vue @@ -0,0 +1,601 @@ + + + diff --git a/vue/src/views/goods/shopGoods/index.vue b/vue/src/views/goods/shopGoods/index.vue new file mode 100644 index 00000000..b3a5eb9e --- /dev/null +++ b/vue/src/views/goods/shopGoods/index.vue @@ -0,0 +1,70 @@ + + + diff --git a/vue/src/views/goods/spec/index.vue b/vue/src/views/goods/spec/index.vue new file mode 100644 index 00000000..282d2961 --- /dev/null +++ b/vue/src/views/goods/spec/index.vue @@ -0,0 +1,311 @@ + + + diff --git a/vue/src/views/goods/supplier/index.vue b/vue/src/views/goods/supplier/index.vue new file mode 100644 index 00000000..f0e9f397 --- /dev/null +++ b/vue/src/views/goods/supplier/index.vue @@ -0,0 +1,388 @@ + + + diff --git a/vue/src/views/offline/aftersale/index.vue b/vue/src/views/offline/aftersale/index.vue new file mode 100644 index 00000000..aad79f99 --- /dev/null +++ b/vue/src/views/offline/aftersale/index.vue @@ -0,0 +1,351 @@ + + + diff --git a/vue/src/views/offline/goods/index.vue b/vue/src/views/offline/goods/index.vue new file mode 100644 index 00000000..78fbc228 --- /dev/null +++ b/vue/src/views/offline/goods/index.vue @@ -0,0 +1,329 @@ + + + diff --git a/vue/src/views/offline/order/create.vue b/vue/src/views/offline/order/create.vue new file mode 100644 index 00000000..a83a44e4 --- /dev/null +++ b/vue/src/views/offline/order/create.vue @@ -0,0 +1,481 @@ + + + diff --git a/vue/src/views/offline/order/index.vue b/vue/src/views/offline/order/index.vue new file mode 100644 index 00000000..d9fa9111 --- /dev/null +++ b/vue/src/views/offline/order/index.vue @@ -0,0 +1,548 @@ + + + diff --git a/vue/src/views/offline/shop/index.vue b/vue/src/views/offline/shop/index.vue new file mode 100644 index 00000000..8f3ab36a --- /dev/null +++ b/vue/src/views/offline/shop/index.vue @@ -0,0 +1,330 @@ + + + diff --git a/vue/src/views/pdd/goods/index.vue b/vue/src/views/pdd/goods/index.vue new file mode 100644 index 00000000..8cbe9689 --- /dev/null +++ b/vue/src/views/pdd/goods/index.vue @@ -0,0 +1,302 @@ + + + diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue new file mode 100644 index 00000000..b05f9af4 --- /dev/null +++ b/vue/src/views/pdd/order/index.vue @@ -0,0 +1,404 @@ + + + diff --git a/vue/src/views/pdd/refund/index.vue b/vue/src/views/pdd/refund/index.vue new file mode 100644 index 00000000..b365d1d5 --- /dev/null +++ b/vue/src/views/pdd/refund/index.vue @@ -0,0 +1,291 @@ + + + diff --git a/vue/src/views/wei/goods/index.vue b/vue/src/views/wei/goods/index.vue new file mode 100644 index 00000000..d963dcbf --- /dev/null +++ b/vue/src/views/wei/goods/index.vue @@ -0,0 +1,275 @@ + + + diff --git a/vue/src/views/wei/order/index.vue b/vue/src/views/wei/order/index.vue new file mode 100644 index 00000000..722fbad9 --- /dev/null +++ b/vue/src/views/wei/order/index.vue @@ -0,0 +1,509 @@ + + + diff --git a/vue/src/views/wei/order/pull_log.vue b/vue/src/views/wei/order/pull_log.vue new file mode 100644 index 00000000..66358899 --- /dev/null +++ b/vue/src/views/wei/order/pull_log.vue @@ -0,0 +1,143 @@ + + + diff --git a/vue/src/views/wei/refund/index.vue b/vue/src/views/wei/refund/index.vue new file mode 100644 index 00000000..3d07b670 --- /dev/null +++ b/vue/src/views/wei/refund/index.vue @@ -0,0 +1,391 @@ + + + diff --git a/vue/vue.config.js b/vue/vue.config.js index 70249cbd..fc937cbc 100644 --- a/vue/vue.config.js +++ b/vue/vue.config.js @@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE || '启航电商OMS系统' // 网页标题 -const port = process.env.port || process.env.npm_config_port || 80 // 端口 +const port = process.env.port || process.env.npm_config_port || 88 // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -35,7 +35,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, + target: `http://localhost:8088`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''