From 22a8fe3c2e333d58f1d35291e36cb7473f57d2bc Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Sat, 20 Jan 2024 14:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/cereshop/admin/aspect/WebLogAspect.java | 5 - .../admin/config/MybatisInterceptorConfig.java | 2 - .../admin/controller/ActivityController.java | 5 +- .../admin/controller/AdvertController.java | 5 +- .../cereshop/admin/controller/AfterController.java | 6 +- .../controller/BusinessPermissionController.java | 5 +- .../controller/BuyerWithdrawalController.java | 5 +- .../admin/controller/ClassifyController.java | 5 +- .../admin/controller/CommentController.java | 5 +- .../admin/controller/CreditRecordController.java | 9 +- .../controller/CreditSignSettingController.java | 5 +- .../cereshop/admin/controller/DictController.java | 5 +- .../admin/controller/DiscountController.java | 5 +- .../admin/controller/ExpressController.java | 5 +- .../admin/controller/FinanceController.java | 5 +- .../cereshop/admin/controller/LiveController.java | 5 +- .../admin/controller/LiveProductController.java | 5 +- .../admin/controller/MakingDataController.java | 2 - .../admin/controller/MemberLevelController.java | 11 +- .../admin/controller/MemberShipController.java | 8 +- .../admin/controller/MessageController.java | 5 +- .../admin/controller/NoticeController.java | 5 +- .../admin/controller/PermissionController.java | 6 +- .../admin/controller/PlatformLabelController.java | 5 +- .../admin/controller/PoliteController.java | 9 +- .../cereshop/admin/controller/RiskController.java | 8 +- .../cereshop/admin/controller/RoleController.java | 5 +- .../admin/controller/SeckillController.java | 10 +- .../admin/controller/SensitiveController.java | 5 +- .../admin/controller/ShopCheckController.java | 5 +- .../admin/controller/UploadController.java | 2 - .../admin/controller/WithdrawalController.java | 5 +- .../cereshop/admin/controller/WordController.java | 5 +- .../lang/CerePlatformLangInfoController.java | 112 +++++++++ .../CerePlatformPermissionLangInfoController.java | 29 +++ .../CereProductClassifyLangInfoController.java | 29 +++ .../product/CereShopProductLangInfoController.java | 29 +++ .../product/CereSkuNameLangInfoController.java | 29 +++ .../product/ProductClassifyLangInfoController.java | 29 +++ .../admin/dao/activity/CereActivitySignDAO.java | 2 +- .../dao/activity/CerePlatformActivityDAO.java | 2 +- .../activity/CerePlatformActivityDetailDAO.java | 2 +- .../admin/dao/activity/CereSignProductDAO.java | 2 +- .../admin/dao/after/CereAfterProductDAO.java | 2 +- .../admin/dao/after/CereOrderAfterDAO.java | 2 +- .../admin/dao/after/CerePlatformAfterDAO.java | 2 +- .../admin/dao/business/CereBusinessUserDAO.java | 2 +- .../dao/business/CereBusinessUserRoleDAO.java | 2 +- .../dao/business/CerePlatformBusinessUserDAO.java | 2 +- .../admin/dao/buyer/CereBuyerReceiveDAO.java | 2 +- .../cereshop/admin/dao/buyer/CereBuyerUserDAO.java | 2 +- .../admin/dao/buyer/CereBuyerWithdrawalDAO.java | 2 +- .../cereshop/admin/dao/city/CereCityManageDAO.java | 2 +- .../admin/dao/credit/CereCreditSignSettingDAO.java | 2 - .../admin/dao/dict/CerePlatformDictDAO.java | 2 +- .../dao/distributor/CereDistributionOrderDAO.java | 2 +- .../dao/distributor/CereDistributorBuyerDAO.java | 2 +- .../distributor/CereShopDistributionLevelDAO.java | 2 +- .../dao/distributor/CereShopDistributorDAO.java | 2 +- .../admin/dao/express/CerePlatformExpressDAO.java | 2 +- .../admin/dao/label/CereBuyerLabelDAO.java | 2 +- .../admin/dao/label/CereLabelSourceDAO.java | 2 +- .../cereshop/admin/dao/label/CereShopLabelDAO.java | 2 +- .../admin/dao/lang/CerePlatformLangInfoDAO.java | 16 ++ .../cereshop/admin/dao/log/CerePlatformLogDAO.java | 2 +- .../admin/dao/log/CerePlatformWebLogDAO.java | 2 +- .../dao/logistics/CereLogisticsChargeDAO.java | 2 +- .../admin/dao/logistics/CereOrderLogisticsDAO.java | 2 +- .../admin/dao/message/CereMessageLogDAO.java | 2 +- .../admin/dao/message/CerePlatfromMessageDAO.java | 2 +- .../admin/dao/order/CereOrderDileverDAO.java | 2 +- .../admin/dao/order/CereOrderParentDAO.java | 2 +- .../admin/dao/order/CereOrderProductDAO.java | 2 +- .../dao/order/CereOrderReconciliationDAO.java | 2 +- .../admin/dao/order/CereOrderReturnDAO.java | 2 +- .../cereshop/admin/dao/order/CereShopOrderDAO.java | 2 +- .../shop/cereshop/admin/dao/pay/CerePayLogDAO.java | 2 +- .../dao/permission/CereBusinessPermissionDAO.java | 2 +- .../dao/permission/CerePlatformPermissionDAO.java | 2 +- .../CerePlatformPermissionLangInfoDAO.java | 16 ++ .../admin/dao/product/CereProductClassifyDAO.java | 2 +- .../product/CereProductClassifyLangInfoDAO.java | 16 ++ .../admin/dao/product/CereProductImageDAO.java | 2 +- .../admin/dao/product/CereProductSkuDAO.java | 2 +- .../dao/product/CereShopProductLangInfoDAO.java | 16 ++ .../admin/dao/product/CereSkuNameLangInfoDAO.java | 16 ++ .../cereshop/admin/dao/redis/CereRedisKeyDAO.java | 2 +- .../cereshop/admin/dao/risk/CereRiskBlackDAO.java | 1 - .../admin/dao/role/CerePlatformRoleDAO.java | 2 +- .../dao/role/CerePlatformRolePermissionDAO.java | 2 +- .../dao/sensitive/CerePlatformSensitiveDAO.java | 2 +- .../admin/dao/shop/CereLabelAttributeDAO.java | 2 +- .../admin/dao/shop/CerePlatformShopDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopBankDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopBannerDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopCheckDAO.java | 1 - .../admin/dao/shop/CereShopCommentDAO.java | 2 +- .../admin/dao/shop/CereShopEnterpriseDAO.java | 2 +- .../admin/dao/shop/CereShopExtensionDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopGroupDAO.java | 2 +- .../dao/shop/CereShopIndividualBusinessesDAO.java | 2 +- .../dao/shop/CereShopOtherOrganizationsDAO.java | 2 +- .../admin/dao/shop/CereShopPersonalDAO.java | 2 +- .../admin/dao/shop/CereShopRecruitDAO.java | 2 +- .../admin/dao/shop/CereShopRelationshipDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopReturnDAO.java | 2 +- .../cereshop/admin/dao/shop/CereShopVisitDAO.java | 2 +- .../admin/dao/shop/CereShopWithdrawalDAO.java | 2 +- .../admin/exception/GlobalExceptionHandler.java | 2 +- .../aliyun/impl/AliyunMessageServiceImpl.java | 4 - .../miaoxin/impl/MiaoxinMessageServiceImpl.java | 1 - .../admin/page/activity/ProductRanking.java | 1 - .../cereshop/admin/page/activity/Proportion.java | 1 - .../com/shop/cereshop/admin/page/after/After.java | 1 - .../admin/page/business/BusinessGetAll.java | 1 - .../cereshop/admin/page/discount/DiscountData.java | 1 - .../cereshop/admin/page/label/PlatformLabel.java | 1 + .../cereshop/admin/page/member/MemberLevel.java | 2 - .../cereshop/admin/page/order/ShopOrderAfter.java | 4 - .../cereshop/admin/page/permission/MenuButton.java | 39 ++- .../cereshop/admin/page/permission/Permission.java | 45 ++-- .../shop/cereshop/admin/page/polite/Polite.java | 2 - .../cereshop/admin/page/polite/PoliteData.java | 3 - .../admin/page/polite/PoliteDataDetail.java | 2 - .../cereshop/admin/page/product/SkuNameParam.java | 2 - .../cereshop/admin/page/seckill/SeckillData.java | 2 - .../admin/page/seckill/SeckillShopProduct.java | 2 - .../param/activity/ActivityGetProductsParam.java | 5 - .../param/activity/ActivityGetShopsParam.java | 6 - .../admin/param/lang/LangInfoAllParam.java | 42 ++++ .../admin/param/lang/LangInfoDeleteParam.java | 25 ++ .../param/member/MemberLevelgetByIdParam.java | 4 - .../admin/param/member/MembershipUpdateParam.java | 2 - .../param/permission/PermissionSaveParam.java | 5 +- .../param/permission/PermissionUpdateParam.java | 5 +- .../param/sharesetting/ShareSettingSaveParam.java | 3 - .../param/withdrawal/WithdrawalGetAllParam.java | 3 - .../admin/pay/weixin/service/WxPayService.java | 4 - .../service/activity/CereActivitySignService.java | 1 - .../activity/CerePlatformActivityService.java | 3 +- .../activity/impl/CereActivitySignServiceImpl.java | 2 - .../admin/service/after/CereOrderAfterService.java | 4 +- .../canvas/CerePlatformCanvasCustomService.java | 5 - .../service/canvas/CerePlatformCanvasService.java | 1 - .../impl/CerePlatformCanvasCustomServiceImpl.java | 1 - .../canvas/impl/CerePlatformCanvasServiceImpl.java | 3 - .../credit/impl/CereCreditRecordServiceImpl.java | 1 - .../service/dict/CerePlatformDictService.java | 2 +- .../dict/impl/CerePlatformDictServiceImpl.java | 2 +- .../service/label/CerePlatformLabelService.java | 2 +- .../label/impl/CerePlatformLabelServiceImpl.java | 2 +- .../service/lang/CerePlatformLangInfoService.java | 35 +++ .../lang/impl/CerePlatformLangInfoServiceImpl.java | 72 ++++++ .../admin/service/log/CerePlatformLogService.java | 3 - .../member/CerePlatformMemberLevelService.java | 1 - .../impl/CerePlatformMemberLevelServiceImpl.java | 1 - .../impl/CerePlatformMembershipServiceImpl.java | 2 - .../message/CerePlatfromMessageService.java | 2 +- .../impl/CerePlatfromMessageServiceImpl.java | 2 +- .../admin/service/notice/CereNoticeService.java | 1 - .../service/notice/impl/CereNoticeServiceImpl.java | 1 - .../CerePlatformPermissionLangInfoService.java | 22 ++ .../impl/CereBusinessPermissionServiceImpl.java | 218 +++++++++++++++- .../CerePlatformPermissionLangInfoServiceImpl.java | 28 +++ .../impl/CerePlatformPermissionServiceImpl.java | 233 ++++++++++++++++- .../PlatformPermissionLangInfoServiceImpl.java | 23 ++ .../platformtool/CerePlatformDiscountService.java | 3 - .../platformtool/CerePlatformSeckillService.java | 1 - .../impl/CerePlatformPoliteServiceImpl.java | 1 - .../CereProductClassifyLangInfoService.java | 22 ++ .../product/CereProductClassifyService.java | 2 +- .../product/CereShopProductLangInfoService.java | 22 ++ .../product/CereSkuNameLangInfoService.java | 22 ++ .../CereProductClassifyLangInfoServiceImpl.java | 28 +++ .../impl/CereProductClassifyServiceImpl.java | 162 +++++++++--- .../product/impl/CereProductImageServiceImpl.java | 1 - .../impl/CereShopProductLangInfoServiceImpl.java | 28 +++ .../impl/CereSkuNameLangInfoServiceImpl.java | 28 +++ .../CerePlatformShareSettingService.java | 6 - .../service/shop/CerePlatformShopService.java | 6 +- .../admin/service/shop/CereShopCheckService.java | 3 +- .../admin/service/shop/CereShopCommentService.java | 2 +- .../service/shop/CereShopWithdrawalService.java | 2 +- .../shop/impl/CerePriceProductServiceImpl.java | 1 - .../shop/impl/CereShopWithdrawalServiceImpl.java | 6 +- .../service/user/CerePlatformUserRoleService.java | 1 - .../service/user/CerePlatformUserService.java | 2 +- .../user/impl/CerePlatformUserRoleServiceImpl.java | 1 - .../word/impl/CerePlatformWordServiceImpl.java | 1 - .../shop/cereshop/admin/third/weixin/XMLParse.java | 9 +- .../admin/timing/LabelInitializationRunnable.java | 1 + .../mapper/lang/CerePlatformLangInfoDAO.xml | 19 ++ .../permission/CerePlatformPermissionDAO.xml | 26 +- .../CerePlatformPermissionLangInfoDAO.xml | 18 ++ .../mapper/product/CereProductClassifyDAO.xml | 21 +- .../product/CereProductClassifyLangInfoDAO.xml | 18 ++ .../mapper/product/CereShopProductLangInfoDAO.xml | 20 ++ .../mapper/product/CereSkuNameLangInfoDAO.xml | 19 ++ .../lang/CerePlatformLangInfoController.java | 48 ++++ .../CerePlatformPermissionLangInfoController.java | 29 +++ .../CereProductClassifyLangInfoController.java | 29 +++ .../product/CereShopProductLangInfoController.java | 29 +++ .../product/CereSkuNameLangInfoController.java | 29 +++ .../app/dao/lang/CerePlatformLangInfoDAO.java | 16 ++ .../CerePlatformPermissionLangInfoDAO.java | 16 ++ .../product/CereProductClassifyLangInfoDAO.java | 16 ++ .../dao/product/CereShopProductLangInfoDAO.java | 16 ++ .../cereshop/app/dao/product/CereSkuNameDAO.java | 11 +- .../app/dao/product/CereSkuNameLangInfoDAO.java | 16 ++ .../app/interceptor/AuthorizationInterceptor.java | 6 + .../shop/cereshop/app/page/classify/Classify.java | 57 +++++ .../cereshop/app/page/product/ProductDetail.java | 66 +++++ .../service/lang/CerePlatformLangInfoService.java | 24 ++ .../lang/impl/CerePlatformLangInfoServiceImpl.java | 51 ++++ .../CerePlatformPermissionLangInfoService.java | 22 ++ .../CerePlatformPermissionLangInfoServiceImpl.java | 28 +++ .../CereProductClassifyLangInfoService.java | 22 ++ .../product/CereShopProductLangInfoService.java | 22 ++ .../product/CereSkuNameLangInfoService.java | 22 ++ .../app/service/product/CereSkuNameService.java | 5 +- .../CereProductClassifyLangInfoServiceImpl.java | 28 +++ .../impl/CereProductClassifyServiceImpl.java | 48 ++++ .../impl/CereShopProductLangInfoServiceImpl.java | 28 +++ .../product/impl/CereShopProductServiceImpl.java | 117 +++++++-- .../impl/CereSkuNameLangInfoServiceImpl.java | 28 +++ .../product/impl/CereSkuNameServiceImpl.java | 5 +- .../com/shop/cereshop/app/utils/ContextUtil.java | 20 ++ .../src/main/resources/application-security.yml | 1 + .../mapper/lang/CerePlatformLangInfoDAO.xml | 19 ++ .../CerePlatformPermissionLangInfoDAO.xml | 18 ++ .../product/CereProductClassifyLangInfoDAO.xml | 18 ++ .../mapper/product/CereShopProductLangInfoDAO.xml | 20 ++ .../mapper/product/CereSkuNameLangInfoDAO.xml | 19 ++ .../lang/CerePlatformLangInfoController.java | 49 ++++ .../CerePlatformPermissionLangInfoController.java | 29 +++ .../CereProductClassifyLangInfoController.java | 29 +++ .../product/CereShopProductLangInfoController.java | 29 +++ .../product/CereSkuNameLangInfoController.java | 29 +++ .../product/ProductClassifyLangInfoController.java | 29 +++ .../business/dao/lang/CerePlatformLangInfoDAO.java | 16 ++ .../CerePlatformPermissionLangInfoDAO.java | 16 ++ .../product/CereProductClassifyLangInfoDAO.java | 16 ++ .../dao/product/CereShopProductLangInfoDAO.java | 16 ++ .../dao/product/CereSkuNameLangInfoDAO.java | 16 ++ .../business/page/canvas/CanvasProduct.java | 56 +++++ .../business/page/permission/MenuButton.java | 37 ++- .../business/page/permission/Permission.java | 37 ++- .../business/page/product/ShopProduct.java | 66 +++++ .../param/permission/PermissionSaveParam.java | 5 +- .../param/permission/PermissionUpdateParam.java | 5 +- .../business/param/product/ProductSaveParam.java | 11 + .../business/param/product/ProductUpdateParam.java | 10 + .../business/param/product/SkuNameParam.java | 12 +- .../business/param/product/SkuValueParam.java | 10 + .../service/lang/CerePlatformLangInfoService.java | 25 ++ .../lang/impl/CerePlatformLangInfoServiceImpl.java | 54 ++++ .../CerePlatformPermissionLangInfoService.java | 22 ++ .../CerePlatformPermissionLangInfoServiceImpl.java | 28 +++ .../impl/CerePlatformPermissionServiceImpl.java | 194 ++++++++++++-- .../CereProductClassifyLangInfoService.java | 22 ++ .../product/CereShopProductLangInfoService.java | 22 ++ .../product/CereSkuNameLangInfoService.java | 22 ++ .../service/product/CereSkuNameService.java | 4 +- .../CereProductClassifyLangInfoServiceImpl.java | 28 +++ .../impl/CereProductClassifyServiceImpl.java | 196 ++++++++++++--- .../impl/CereShopProductLangInfoServiceImpl.java | 28 +++ .../product/impl/CereShopProductServiceImpl.java | 278 ++++++++++++++++++--- .../impl/CereSkuNameLangInfoServiceImpl.java | 28 +++ .../product/impl/CereSkuNameServiceImpl.java | 3 +- .../src/main/resources/application-security.yml | 1 + .../mapper/lang/CerePlatformLangInfoDAO.xml | 19 ++ .../permission/CerePlatformPermissionDAO.xml | 21 +- .../CerePlatformPermissionLangInfoDAO.xml | 18 ++ .../mapper/product/CereProductClassifyDAO.xml | 21 +- .../product/CereProductClassifyLangInfoDAO.xml | 18 ++ .../mapper/product/CereShopProductLangInfoDAO.xml | 20 ++ .../mybatis/mapper/product/CereSkuNameDAO.xml | 3 +- .../mapper/product/CereSkuNameLangInfoDAO.xml | 19 ++ .../commons/domain/lang/CerePlatformLangInfo.java | 107 ++++++++ .../domain/permission/CerePlatformPermission.java | 47 ++-- .../permission/CerePlatformPermissionLangInfo.java | 84 +++++++ .../domain/product/CereProductClassify.java | 65 ++--- .../product/CereProductClassifyLangInfo.java | 84 +++++++ .../commons/domain/product/CereShopProduct.java | 65 +++++ .../domain/product/CereShopProductLangInfo.java | 102 ++++++++ .../commons/domain/product/CereSkuName.java | 68 +++++ .../domain/product/CereSkuNameLangInfo.java | 94 +++++++ .../cereshop/commons/domain/product/Classify.java | 64 ++--- .../cereshop/commons/domain/product/SkuName.java | 9 + .../cereshop/commons/domain/product/SkuValue.java | 9 + .../com/shop/cereshop/commons/utils/LangUtil.java | 16 ++ 291 files changed, 4756 insertions(+), 665 deletions(-) create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/lang/CerePlatformLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/permission/CerePlatformPermissionLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereProductClassifyLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereShopProductLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereSkuNameLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/ProductClassifyLangInfoController.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/lang/CerePlatformLangInfoDAO.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionLangInfoDAO.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyLangInfoDAO.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereShopProductLangInfoDAO.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereSkuNameLangInfoDAO.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoAllParam.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoDeleteParam.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/CerePlatformLangInfoService.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/impl/CerePlatformLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/CerePlatformPermissionLangInfoService.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/PlatformPermissionLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyLangInfoService.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereShopProductLangInfoService.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereSkuNameLangInfoService.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereSkuNameLangInfoServiceImpl.java create mode 100644 cereshop-admin/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml create mode 100644 cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml create mode 100644 cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml create mode 100644 cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml create mode 100644 cereshop-admin/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/lang/CerePlatformLangInfoController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/permission/CerePlatformPermissionLangInfoController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereProductClassifyLangInfoController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereShopProductLangInfoController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereSkuNameLangInfoController.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/lang/CerePlatformLangInfoDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/permission/CerePlatformPermissionLangInfoDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereProductClassifyLangInfoDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductLangInfoDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameLangInfoDAO.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/CerePlatformLangInfoService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/impl/CerePlatformLangInfoServiceImpl.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/CerePlatformPermissionLangInfoService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereProductClassifyLangInfoService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereShopProductLangInfoService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameLangInfoService.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyLangInfoServiceImpl.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductLangInfoServiceImpl.java create mode 100644 cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameLangInfoServiceImpl.java create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml create mode 100644 cereshop-app/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/lang/CerePlatformLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/permission/CerePlatformPermissionLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereProductClassifyLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereShopProductLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereSkuNameLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/ProductClassifyLangInfoController.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/lang/CerePlatformLangInfoDAO.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/permission/CerePlatformPermissionLangInfoDAO.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereProductClassifyLangInfoDAO.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereShopProductLangInfoDAO.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereSkuNameLangInfoDAO.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/CerePlatformLangInfoService.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/impl/CerePlatformLangInfoServiceImpl.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/CerePlatformPermissionLangInfoService.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereProductClassifyLangInfoService.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereShopProductLangInfoService.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameLangInfoService.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyLangInfoServiceImpl.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductLangInfoServiceImpl.java create mode 100644 cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameLangInfoServiceImpl.java create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml create mode 100644 cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/lang/CerePlatformLangInfo.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermissionLangInfo.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassifyLangInfo.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProductLangInfo.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuNameLangInfo.java create mode 100644 cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/LangUtil.java diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/aspect/WebLogAspect.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/aspect/WebLogAspect.java index b1af86f..07b1c6e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/aspect/WebLogAspect.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/aspect/WebLogAspect.java @@ -5,15 +5,11 @@ */ package com.shop.cereshop.admin.aspect; -import com.alibaba.fastjson.JSONObject; import com.shop.cereshop.admin.service.log.CerePlatformWebLogService; import com.shop.cereshop.commons.constant.IntegerEnum; -import com.shop.cereshop.commons.domain.express.HttpResult; import com.shop.cereshop.commons.domain.log.CerePlatformWebLog; import com.shop.cereshop.commons.result.Result; import com.shop.cereshop.commons.utils.AppletPayUtil; -import com.shop.cereshop.commons.utils.GsonUtil; -import com.shop.cereshop.commons.utils.HttpUtils; import com.shop.cereshop.commons.utils.TimeUtils; import eu.bitwalker.useragentutils.Browser; import eu.bitwalker.useragentutils.UserAgent; @@ -28,7 +24,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.applet.Applet; @Aspect @Component diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/config/MybatisInterceptorConfig.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/config/MybatisInterceptorConfig.java index 11f852c..e27fa9b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/config/MybatisInterceptorConfig.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/config/MybatisInterceptorConfig.java @@ -10,8 +10,6 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.Properties; - @Configuration public class MybatisInterceptorConfig { diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ActivityController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ActivityController.java index e6e42ab..6ff1e1d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ActivityController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ActivityController.java @@ -24,7 +24,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdvertController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdvertController.java index ce81a2a..969c25a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdvertController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AdvertController.java @@ -15,7 +15,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 广告 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AfterController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AfterController.java index 560bc78..0c7beb4 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AfterController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/AfterController.java @@ -8,7 +8,6 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.annotation.NoRepeatWebLog; import com.shop.cereshop.admin.page.after.*; -import com.shop.cereshop.admin.page.order.ShopOrderExportDTO; import com.shop.cereshop.admin.param.after.*; import com.shop.cereshop.admin.service.after.CereOrderAfterService; import com.shop.cereshop.commons.domain.common.Page; @@ -22,7 +21,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BusinessPermissionController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BusinessPermissionController.java index 69b36ce..85068d3 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BusinessPermissionController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BusinessPermissionController.java @@ -24,7 +24,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BuyerWithdrawalController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BuyerWithdrawalController.java index 5c2c0c8..cffbb82 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BuyerWithdrawalController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/BuyerWithdrawalController.java @@ -19,7 +19,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ClassifyController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ClassifyController.java index f432f21..870156b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ClassifyController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ClassifyController.java @@ -24,7 +24,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CommentController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CommentController.java index dcc7e58..3803993 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CommentController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CommentController.java @@ -23,7 +23,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditRecordController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditRecordController.java index eac5b69..4d5c5fc 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditRecordController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditRecordController.java @@ -6,20 +6,19 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.page.credit.CereCreditRecordPage; -import com.shop.cereshop.admin.page.shop.ShopComment; -import com.shop.cereshop.admin.param.comment.CommentGetAllParam; import com.shop.cereshop.admin.param.credit.CreditRecordGetAllParam; import com.shop.cereshop.admin.service.credit.CereCreditRecordService; -import com.shop.cereshop.admin.service.shop.CereShopCommentService; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.credit.CereCreditRecord; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 积分记录 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditSignSettingController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditSignSettingController.java index d24eb62..4f649ca 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditSignSettingController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/CreditSignSettingController.java @@ -15,7 +15,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 积分签到配置 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DictController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DictController.java index 148ef74..7ac50bb 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DictController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DictController.java @@ -25,7 +25,10 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DiscountController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DiscountController.java index b5696eb..98dda62 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DiscountController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/DiscountController.java @@ -27,7 +27,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ExpressController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ExpressController.java index d0903ed..2ca0da5 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ExpressController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ExpressController.java @@ -17,7 +17,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/FinanceController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/FinanceController.java index 33a8b28..42dc520 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/FinanceController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/FinanceController.java @@ -17,7 +17,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 财务管理 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveController.java index d01ecb9..9ffcf7d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveController.java @@ -20,7 +20,10 @@ import com.shop.cereshop.commons.utils.GsonUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveProductController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveProductController.java index bb5ab97..3372e72 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveProductController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/LiveProductController.java @@ -20,7 +20,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MakingDataController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MakingDataController.java index a768f8f..00d98e2 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MakingDataController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MakingDataController.java @@ -7,14 +7,12 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.service.mark.MarkDataService; -import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberLevelController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberLevelController.java index 8b8ce52..39916b0 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberLevelController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberLevelController.java @@ -8,12 +8,12 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.annotation.NoRepeatWebLog; import com.shop.cereshop.admin.page.member.MemberLevel; -import com.shop.cereshop.admin.param.member.*; +import com.shop.cereshop.admin.param.member.MemberLevelSaveParam; +import com.shop.cereshop.admin.param.member.MemberLevelUpdateParam; +import com.shop.cereshop.admin.param.member.MemberLevelgetByIdParam; import com.shop.cereshop.admin.service.member.CerePlatformMemberLevelService; -import com.shop.cereshop.admin.service.member.CerePlatformMembershipService; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.member.CerePlatformMemberLevel; import com.shop.cereshop.commons.domain.member.CerePlatformMembership; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; @@ -24,7 +24,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberShipController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberShipController.java index 3dde48e..f0bce64 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberShipController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MemberShipController.java @@ -7,15 +7,12 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.annotation.NoRepeatWebLog; -import com.shop.cereshop.admin.param.dict.DictSaveParam; import com.shop.cereshop.admin.param.member.MembershipGetByIdParam; import com.shop.cereshop.admin.param.member.MembershipSaveParam; import com.shop.cereshop.admin.param.member.MembershipUpdateParam; import com.shop.cereshop.admin.service.member.CerePlatformMembershipService; -import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.dict.CerePlatformDict; import com.shop.cereshop.commons.domain.member.CerePlatformMembership; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; @@ -26,7 +23,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MessageController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MessageController.java index c3736ff..cefdb1e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MessageController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/MessageController.java @@ -20,7 +20,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/NoticeController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/NoticeController.java index f39371e..e9b2f42 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/NoticeController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/NoticeController.java @@ -21,7 +21,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PermissionController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PermissionController.java index 7888dad..962fa7a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PermissionController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PermissionController.java @@ -10,7 +10,6 @@ import com.shop.cereshop.admin.annotation.NoRepeatWebLog; import com.shop.cereshop.admin.page.permission.Permission; import com.shop.cereshop.admin.param.permission.*; import com.shop.cereshop.admin.service.permission.CerePlatformPermissionService; -import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; import com.shop.cereshop.commons.domain.user.CerePlatformUser; @@ -22,7 +21,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PlatformLabelController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PlatformLabelController.java index 1df55c5..035944c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PlatformLabelController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PlatformLabelController.java @@ -22,7 +22,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PoliteController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PoliteController.java index 387637f..9674f33 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PoliteController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/PoliteController.java @@ -11,17 +11,13 @@ import com.shop.cereshop.admin.page.polite.Polite; import com.shop.cereshop.admin.page.polite.PoliteActivity; import com.shop.cereshop.admin.page.polite.PoliteData; import com.shop.cereshop.admin.page.polite.PoliteDetail; -import com.shop.cereshop.admin.page.seckill.SeckillData; import com.shop.cereshop.admin.param.polite.PoliteGetAllParam; import com.shop.cereshop.admin.param.polite.PoliteGetByIdParam; import com.shop.cereshop.admin.param.polite.PoliteSaveParam; import com.shop.cereshop.admin.param.polite.PoliteUpdateParam; -import com.shop.cereshop.admin.param.seckill.SeckillGetByIdParam; -import com.shop.cereshop.admin.param.seckill.SeckillSaveParam; import com.shop.cereshop.admin.service.platformtool.CerePlatformPoliteService; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.platformtool.CerePlatformSeckill; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; @@ -31,7 +27,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RiskController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RiskController.java index 67ea5d4..da4c2b3 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RiskController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RiskController.java @@ -1,8 +1,6 @@ package com.shop.cereshop.admin.controller; -import com.shop.cereshop.admin.page.credit.CereCreditRecordPage; import com.shop.cereshop.admin.page.risk.CereRiskUserBlack; -import com.shop.cereshop.admin.param.credit.CreditRecordGetAllParam; import com.shop.cereshop.admin.param.risk.CereRiskBlackPageParam; import com.shop.cereshop.admin.service.risk.CereRiskBlackService; import com.shop.cereshop.admin.service.risk.CereRiskRuleService; @@ -13,11 +11,13 @@ import com.shop.cereshop.commons.domain.risk.CereRiskRule; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 风控模块 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RoleController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RoleController.java index 1132edb..b8864d5 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RoleController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/RoleController.java @@ -22,7 +22,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SeckillController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SeckillController.java index b7ea0b7..5f3312b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SeckillController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SeckillController.java @@ -7,7 +7,10 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.annotation.NoRepeatWebLog; -import com.shop.cereshop.admin.page.seckill.*; +import com.shop.cereshop.admin.page.seckill.Seckill; +import com.shop.cereshop.admin.page.seckill.SeckillData; +import com.shop.cereshop.admin.page.seckill.SeckillShop; +import com.shop.cereshop.admin.page.seckill.SeckillShopProduct; import com.shop.cereshop.admin.param.seckill.*; import com.shop.cereshop.admin.service.platformtool.CerePlatformSeckillService; import com.shop.cereshop.commons.domain.common.Page; @@ -24,7 +27,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SensitiveController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SensitiveController.java index 25a9427..fb97e42 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SensitiveController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/SensitiveController.java @@ -20,7 +20,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopCheckController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopCheckController.java index c059ed7..c6e664d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopCheckController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/ShopCheckController.java @@ -22,7 +22,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/UploadController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/UploadController.java index d618f2e..e5fc57e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/UploadController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/UploadController.java @@ -6,9 +6,7 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.alioss.page.Url; -import com.shop.cereshop.admin.alioss.service.FileUploadService; import com.shop.cereshop.commons.constant.CoReturnFormat; -import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; import com.shop.cereshop.commons.upload.strategy.FileStrategy; import io.swagger.annotations.Api; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WithdrawalController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WithdrawalController.java index 60416a8..889517d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WithdrawalController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WithdrawalController.java @@ -21,7 +21,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WordController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WordController.java index e06cd1f..d394cb8 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WordController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/WordController.java @@ -22,7 +22,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/lang/CerePlatformLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/lang/CerePlatformLangInfoController.java new file mode 100644 index 0000000..a672983 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/lang/CerePlatformLangInfoController.java @@ -0,0 +1,112 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.lang; + +import com.shop.cereshop.admin.annotation.NoRepeatSubmit; +import com.shop.cereshop.admin.annotation.NoRepeatWebLog; +import com.shop.cereshop.admin.page.business.BusinessGetAll; +import com.shop.cereshop.admin.param.brand.BrandParam; +import com.shop.cereshop.admin.param.business.BusinessGetAllParam; +import com.shop.cereshop.admin.param.lang.LangInfoAllParam; +import com.shop.cereshop.admin.param.lang.LangInfoDeleteParam; +import com.shop.cereshop.admin.service.lang.CerePlatformLangInfoService; +import com.shop.cereshop.admin.service.permission.CerePlatformPermissionService; +import com.shop.cereshop.commons.domain.brand.Brand; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.result.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformLangInfo") +@Api(value = "CerePlatformLangInfo", tags = "") +public class CerePlatformLangInfoController { + + @Autowired + private CerePlatformLangInfoService cerePlatformLangInfoService; + + /** + * 商家管理查询 + * @param param + * @return + */ + @PostMapping(value = "getAll") + @ApiOperation(value = "多语言查询") + public Result> getAll(@RequestBody LangInfoAllParam param) throws CoBusinessException { + Page page= cerePlatformLangInfoService.getAll(param); + return new Result(page); + } + +// /** +// * 品牌详情查询 +// * @param param +// * @return +// */ +// @PostMapping(value = "getById") +// @ApiOperation(value = "多语言详情查询") +// public Result getById(@RequestBody CerePlatformLangInfo param) throws CoBusinessException{ +// Brand brand = cerePlatformLangInfoService.getById(param.getId()); +// return new Result(brand); +// } + + /** + * 新增品牌 + * @param param + * @return + */ + @PostMapping(value = "save") + @NoRepeatSubmit + @ApiOperation(value = "新增多语言") + @NoRepeatWebLog + public Result save(@RequestBody CerePlatformLangInfo param) throws CoBusinessException{ + return new Result(cerePlatformLangInfoService.save(param)); + } + + /** + * 更新品牌 + * @param param + * @return + */ + @PostMapping(value = "update") + @NoRepeatSubmit + @ApiOperation(value = "更新多语言") + @NoRepeatWebLog + public Result update(@RequestBody CerePlatformLangInfo param) throws CoBusinessException{ + return new Result(cerePlatformLangInfoService.update(param)); + } + + /** + * 删除品牌 + * @param param + * @return + */ + @PostMapping(value = "delete") + @NoRepeatSubmit + @ApiOperation(value = "删除多语言") + @NoRepeatWebLog + public Result delete(@RequestBody LangInfoDeleteParam param) throws CoBusinessException{ + return new Result(cerePlatformLangInfoService.delete(param.getId())); + } +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/permission/CerePlatformPermissionLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/permission/CerePlatformPermissionLangInfoController.java new file mode 100644 index 0000000..7f210d8 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/permission/CerePlatformPermissionLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.permission; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformPermissionLangInfo") +@Api(value = "CerePlatformPermissionLangInfo", tags = "") +public class CerePlatformPermissionLangInfoController { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereProductClassifyLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereProductClassifyLangInfoController.java new file mode 100644 index 0000000..51a44e3 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereProductClassifyLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cereProductClassifyLangInfo") +@Api(value = "CereProductClassifyLangInfo", tags = "") +public class CereProductClassifyLangInfoController { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereShopProductLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereShopProductLangInfoController.java new file mode 100644 index 0000000..a8c9eac --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereShopProductLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@RestController +@RequestMapping("/cereShopProductLangInfo") +@Api(value = "CereShopProductLangInfo", tags = "店铺商品信息表") +public class CereShopProductLangInfoController { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereSkuNameLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereSkuNameLangInfoController.java new file mode 100644 index 0000000..ca32f4c --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/CereSkuNameLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@RestController +@RequestMapping("/cereSkuNameLangInfo") +@Api(value = "CereSkuNameLangInfo", tags = "商品规格属性信息表") +public class CereSkuNameLangInfoController { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/ProductClassifyLangInfoController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/ProductClassifyLangInfoController.java new file mode 100644 index 0000000..fe73c6e --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/product/ProductClassifyLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-23 + */ +@Slf4j +@RestController +@RequestMapping("/productClassifyLangInfo") +@Api(value = "ProductClassifyLangInfo", tags = "") +public class ProductClassifyLangInfoController { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereActivitySignDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereActivitySignDAO.java index ebbe5cb..e8e3e82 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereActivitySignDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereActivitySignDAO.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.dao.activity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.finance.ShopBond; import com.shop.cereshop.admin.param.finance.BondParam; import com.shop.cereshop.commons.domain.activity.CereActivitySign; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDAO.java index ad6c117..6f001c5 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDAO.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.dao.activity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.activity.*; import com.shop.cereshop.admin.page.canvas.CanvasCoupon; import com.shop.cereshop.admin.page.canvas.CanvasCouponDetail; @@ -19,7 +20,6 @@ import com.shop.cereshop.commons.domain.activity.CerePlatformActivity; import com.shop.cereshop.commons.domain.pay.CerePayLog; import com.shop.cereshop.commons.domain.product.CereProductClassify; import com.shop.cereshop.commons.domain.shop.ShopDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDetailDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDetailDAO.java index a5e9d13..9a4bed7 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDetailDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CerePlatformActivityDetailDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.activity; -import com.shop.cereshop.commons.domain.activity.CerePlatformActivityDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.activity.CerePlatformActivityDetail; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereSignProductDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereSignProductDAO.java index 0f9e488..6f21f35 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereSignProductDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/activity/CereSignProductDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.activity; -import com.shop.cereshop.commons.domain.activity.CereSignProduct; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.activity.CereSignProduct; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereAfterProductDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereAfterProductDAO.java index c8636fb..85afea7 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereAfterProductDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereAfterProductDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.after; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.after.CereAfterProduct; import com.shop.cereshop.commons.domain.after.CereAfterProductAttribute; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereOrderAfterDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereOrderAfterDAO.java index 26bc64a..9b2b44b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereOrderAfterDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CereOrderAfterDAO.java @@ -5,12 +5,12 @@ */ package com.shop.cereshop.admin.dao.after; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.after.*; import com.shop.cereshop.admin.param.after.AfterGetAllParam; import com.shop.cereshop.commons.domain.after.CereOrderAfter; import com.shop.cereshop.commons.domain.order.CereOrderProduct; import com.shop.cereshop.commons.domain.product.CereProductSku; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CerePlatformAfterDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CerePlatformAfterDAO.java index b950611..6837036 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CerePlatformAfterDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/after/CerePlatformAfterDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.after; -import com.shop.cereshop.commons.domain.after.CerePlatformAfter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.after.CerePlatformAfter; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserDAO.java index 7d6142a..76a9e19 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.business; -import com.shop.cereshop.commons.domain.business.CereBusinessUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereBusinessUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserRoleDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserRoleDAO.java index f1ee83e..996ebbf 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserRoleDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CereBusinessUserRoleDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.business; -import com.shop.cereshop.commons.domain.business.CereBusinessUserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereBusinessUserRole; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessUserDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessUserDAO.java index bf1c850..9df58aa 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessUserDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessUserDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.business; -import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerReceiveDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerReceiveDAO.java index c5b64e8..97a5df4 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerReceiveDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerReceiveDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.buyer; -import com.shop.cereshop.commons.domain.buyer.CereBuyerReceive; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.buyer.CereBuyerReceive; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerUserDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerUserDAO.java index 1740924..d8e69f8 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerUserDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerUserDAO.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.dao.buyer; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.buyer.BuyerComment; import com.shop.cereshop.admin.page.buyer.BuyerOrder; import com.shop.cereshop.admin.page.buyer.BuyerUser; @@ -15,7 +16,6 @@ import com.shop.cereshop.admin.param.buyer.BuyerGetLabelsParam; import com.shop.cereshop.commons.domain.buyer.CereBuyerReceive; import com.shop.cereshop.commons.domain.buyer.CereBuyerUser; import com.shop.cereshop.commons.domain.label.CerePlatformLabel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerWithdrawalDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerWithdrawalDAO.java index e4247ea..8e03ff9 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerWithdrawalDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/buyer/CereBuyerWithdrawalDAO.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.dao.buyer; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.buyer.BuyerWithdrawal; import com.shop.cereshop.admin.param.withdrawal.BuyerWithdrawalGetAllParam; import com.shop.cereshop.commons.domain.buyer.CereBuyerWithdrawal; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/city/CereCityManageDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/city/CereCityManageDAO.java index 526cd39..6f1607f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/city/CereCityManageDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/city/CereCityManageDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.city; -import com.shop.cereshop.commons.domain.city.CereCityManage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.city.CereCityManage; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/credit/CereCreditSignSettingDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/credit/CereCreditSignSettingDAO.java index 51edb52..c92247d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/credit/CereCreditSignSettingDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/credit/CereCreditSignSettingDAO.java @@ -6,8 +6,6 @@ package com.shop.cereshop.admin.dao.credit; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.shop.cereshop.admin.page.credit.CereCreditRecordPage; -import com.shop.cereshop.admin.param.credit.CreditRecordGetAllParam; import com.shop.cereshop.commons.domain.common.PageParam; import com.shop.cereshop.commons.domain.credit.CereCreditSignSetting; import org.apache.ibatis.annotations.Mapper; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/dict/CerePlatformDictDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/dict/CerePlatformDictDAO.java index feabeed..45c2836 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/dict/CerePlatformDictDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/dict/CerePlatformDictDAO.java @@ -5,11 +5,11 @@ */ package com.shop.cereshop.admin.dao.dict; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.param.dict.DictGetAllParam; import com.shop.cereshop.admin.param.dict.DictGetChildsParam; import com.shop.cereshop.admin.param.dict.DictUpdateParam; import com.shop.cereshop.commons.domain.dict.CerePlatformDict; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributionOrderDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributionOrderDAO.java index 823eb80..5ad184a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributionOrderDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributionOrderDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.distributor; -import com.shop.cereshop.commons.domain.distributor.CereDistributionOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.distributor.CereDistributionOrder; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributorBuyerDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributorBuyerDAO.java index 9516270..5383458 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributorBuyerDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereDistributorBuyerDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.distributor; -import com.shop.cereshop.commons.domain.distributor.CereDistributorBuyer; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.distributor.CereDistributorBuyer; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributionLevelDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributionLevelDAO.java index 3b9912f..b68826c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributionLevelDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributionLevelDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.distributor; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.distributor.CereShopDistributionLevel; import com.shop.cereshop.commons.domain.distributor.CereShopDistributor; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributorDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributorDAO.java index 37ae605..34438da 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributorDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/distributor/CereShopDistributorDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.distributor; -import com.shop.cereshop.commons.domain.distributor.CereShopDistributor; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.distributor.CereShopDistributor; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/express/CerePlatformExpressDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/express/CerePlatformExpressDAO.java index 1fc1589..84502fb 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/express/CerePlatformExpressDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/express/CerePlatformExpressDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.express; -import com.shop.cereshop.commons.domain.express.CerePlatformExpress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.express.CerePlatformExpress; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereBuyerLabelDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereBuyerLabelDAO.java index 2fff1a3..1eb1c07 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereBuyerLabelDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereBuyerLabelDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.label; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.param.buyer.BuyerSaveUserLabelParam; import com.shop.cereshop.commons.domain.label.CereBuyerLabel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereLabelSourceDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereLabelSourceDAO.java index 5dac8c7..d5abd59 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereLabelSourceDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereLabelSourceDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.label; -import com.shop.cereshop.commons.domain.label.CereLabelSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.label.CereLabelSource; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereShopLabelDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereShopLabelDAO.java index 16b58a1..85dd911 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereShopLabelDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/label/CereShopLabelDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.label; -import com.shop.cereshop.commons.domain.label.CereShopLabel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.label.CereShopLabel; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/lang/CerePlatformLangInfoDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/lang/CerePlatformLangInfoDAO.java new file mode 100644 index 0000000..3499f1f --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/lang/CerePlatformLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.dao.lang; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformLogDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformLogDAO.java index 19aaed6..b11c784 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformLogDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformLogDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.log; -import com.shop.cereshop.commons.domain.log.CerePlatformLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.log.CerePlatformLog; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformWebLogDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformWebLogDAO.java index 3d5dc27..cfea7bd 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformWebLogDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/log/CerePlatformWebLogDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.log; -import com.shop.cereshop.commons.domain.log.CerePlatformWebLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.log.CerePlatformWebLog; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereLogisticsChargeDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereLogisticsChargeDAO.java index faa6958..57aa568 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereLogisticsChargeDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereLogisticsChargeDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.logistics; -import com.shop.cereshop.commons.domain.logistics.CereLogisticsCharge; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.logistics.CereLogisticsCharge; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereOrderLogisticsDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereOrderLogisticsDAO.java index c0d9549..502797b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereOrderLogisticsDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/logistics/CereOrderLogisticsDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.logistics; -import com.shop.cereshop.commons.domain.logistics.CereOrderLogistics; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.logistics.CereOrderLogistics; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CereMessageLogDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CereMessageLogDAO.java index 6fa589d..dd5081f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CereMessageLogDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CereMessageLogDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.message; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.message.CereMessageLog; import com.shop.cereshop.commons.domain.message.CerePlatfromMessage; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CerePlatfromMessageDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CerePlatfromMessageDAO.java index 7d634ae..491042a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CerePlatfromMessageDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/message/CerePlatfromMessageDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.message; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.param.message.MessageGetAllParam; import com.shop.cereshop.commons.domain.message.CerePlatfromMessage; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderDileverDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderDileverDAO.java index f97d5ea..0dd5a27 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderDileverDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderDileverDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.order; -import com.shop.cereshop.commons.domain.after.CereOrderDilever; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.after.CereOrderDilever; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderParentDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderParentDAO.java index 575a133..5125607 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderParentDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderParentDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.order; -import com.shop.cereshop.commons.domain.order.CereOrderParent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.order.CereOrderParent; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderProductDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderProductDAO.java index 57b9d6a..f11030a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderProductDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderProductDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.order; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.order.CereOrderProduct; import com.shop.cereshop.commons.domain.order.CereOrderProductAttribute; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReconciliationDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReconciliationDAO.java index a840d80..3ff2c0a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReconciliationDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReconciliationDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.order; -import com.shop.cereshop.commons.domain.order.CereOrderReconciliation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.order.CereOrderReconciliation; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReturnDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReturnDAO.java index 3b33a2b..9daac72 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReturnDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereOrderReturnDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.order; -import com.shop.cereshop.commons.domain.order.CereOrderReturn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.order.CereOrderReturn; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereShopOrderDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereShopOrderDAO.java index f333d0c..495728a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereShopOrderDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/order/CereShopOrderDAO.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.dao.order; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.order.ShopOrder; import com.shop.cereshop.admin.page.order.ShopOrderAfter; import com.shop.cereshop.admin.page.product.Product; @@ -13,7 +14,6 @@ import com.shop.cereshop.admin.param.order.OrderGetAllParam; import com.shop.cereshop.commons.domain.order.CereOrderParent; import com.shop.cereshop.commons.domain.order.CereShopOrder; import com.shop.cereshop.commons.domain.product.CereProductSku; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/pay/CerePayLogDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/pay/CerePayLogDAO.java index b76f032..c5d416f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/pay/CerePayLogDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/pay/CerePayLogDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.pay; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.after.PayLog; import com.shop.cereshop.commons.domain.pay.CerePayLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CereBusinessPermissionDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CereBusinessPermissionDAO.java index 18ff27f..f68ce71 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CereBusinessPermissionDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CereBusinessPermissionDAO.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.dao.permission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.permission.MenuButton; import com.shop.cereshop.admin.page.permission.Permission; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionDAO.java index 5419a07..95b59ff 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionDAO.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.dao.permission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.permission.MenuButton; import com.shop.cereshop.admin.page.permission.Permission; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionLangInfoDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionLangInfoDAO.java new file mode 100644 index 0000000..f75c7dc --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/permission/CerePlatformPermissionLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.dao.permission; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformPermissionLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyDAO.java index 9da6db7..06c1eda 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyDAO.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.dao.product; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.product.CereProductClassify; import com.shop.cereshop.commons.domain.product.CereShopProduct; import com.shop.cereshop.commons.domain.product.Classify; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyLangInfoDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyLangInfoDAO.java new file mode 100644 index 0000000..dd84ab5 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductClassifyLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereProductClassifyLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductImageDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductImageDAO.java index 751f3c3..c8e0726 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductImageDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductImageDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.product; -import com.shop.cereshop.commons.domain.product.CereProductImage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereProductImage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductSkuDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductSkuDAO.java index 2face30..8272dee 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductSkuDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereProductSkuDAO.java @@ -5,12 +5,12 @@ */ package com.shop.cereshop.admin.dao.product; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.product.Sku; import com.shop.cereshop.admin.page.product.SkuNameParam; import com.shop.cereshop.admin.page.product.SkuNameValueParam; import com.shop.cereshop.admin.page.product.SkuValueParam; import com.shop.cereshop.commons.domain.product.CereProductSku; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.commons.domain.product.CereSkuName; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereShopProductLangInfoDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereShopProductLangInfoDAO.java new file mode 100644 index 0000000..e77b9f9 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereShopProductLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereShopProductLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereSkuNameLangInfoDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereSkuNameLangInfoDAO.java new file mode 100644 index 0000000..a23240e --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/product/CereSkuNameLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereSkuNameLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/redis/CereRedisKeyDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/redis/CereRedisKeyDAO.java index f814de6..a8bc3d1 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/redis/CereRedisKeyDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/redis/CereRedisKeyDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.redis; -import com.shop.cereshop.commons.domain.redis.CereRedisKey; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.redis.CereRedisKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/risk/CereRiskBlackDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/risk/CereRiskBlackDAO.java index f49a397..31bd1ba 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/risk/CereRiskBlackDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/risk/CereRiskBlackDAO.java @@ -10,7 +10,6 @@ import com.shop.cereshop.admin.page.risk.CereRiskUserBlack; import com.shop.cereshop.admin.param.risk.CereRiskBlackPageParam; import com.shop.cereshop.commons.domain.risk.CereRiskBlack; import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; import java.util.List; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRoleDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRoleDAO.java index 76b1915..ad4b1fd 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRoleDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRoleDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.role; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.param.role.RoleGetAllParam; import com.shop.cereshop.commons.domain.role.CerePlatformRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRolePermissionDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRolePermissionDAO.java index 416655e..e56ef68 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRolePermissionDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/role/CerePlatformRolePermissionDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.role; -import com.shop.cereshop.commons.domain.role.CerePlatformRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.role.CerePlatformRolePermission; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/sensitive/CerePlatformSensitiveDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/sensitive/CerePlatformSensitiveDAO.java index da4b814..402abea 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/sensitive/CerePlatformSensitiveDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/sensitive/CerePlatformSensitiveDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.sensitive; -import com.shop.cereshop.commons.domain.sensitive.CerePlatformSensitive; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.sensitive.CerePlatformSensitive; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereLabelAttributeDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereLabelAttributeDAO.java index 4dcb918..4b69294 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereLabelAttributeDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereLabelAttributeDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereLabelAttribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereLabelAttribute; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CerePlatformShopDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CerePlatformShopDAO.java index 04958b6..0f1f9aa 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CerePlatformShopDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CerePlatformShopDAO.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.dao.shop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.finance.Finance; import com.shop.cereshop.admin.page.shop.Shop; import com.shop.cereshop.admin.page.shop.ShopGetAll; @@ -12,7 +13,6 @@ import com.shop.cereshop.admin.param.finance.FinanceParam; import com.shop.cereshop.admin.param.shop.ShopGetAllParam; import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; import com.shop.cereshop.commons.domain.shop.CerePlatformShop; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBankDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBankDAO.java index ade7a16..96d1b8f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBankDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBankDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopBank; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopBank; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBannerDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBannerDAO.java index 88667c7..605e863 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBannerDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopBannerDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopBanner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopBanner; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCheckDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCheckDAO.java index ffe6128..f50bf6e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCheckDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCheckDAO.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.dao.shop; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.business.Business; -import com.shop.cereshop.admin.page.shop.Shop; import com.shop.cereshop.admin.param.shopcheck.CheckGetAllParam; import com.shop.cereshop.commons.domain.shop.CereShopCheck; import org.apache.ibatis.annotations.Mapper; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCommentDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCommentDAO.java index 42db348..5d88b1e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCommentDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopCommentDAO.java @@ -5,11 +5,11 @@ */ package com.shop.cereshop.admin.dao.shop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.page.shop.CommentDetail; import com.shop.cereshop.admin.page.shop.ShopComment; import com.shop.cereshop.admin.param.comment.CommentGetAllParam; import com.shop.cereshop.commons.domain.shop.CereShopComment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopEnterpriseDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopEnterpriseDAO.java index 70f301b..e974cc6 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopEnterpriseDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopEnterpriseDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.business.CereShopEnterprise; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereShopEnterprise; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopExtensionDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopExtensionDAO.java index 3acca08..5826cf6 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopExtensionDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopExtensionDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopExtension; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopExtension; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopGroupDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopGroupDAO.java index 2c0ef2d..25fb09e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopGroupDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopGroupDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopGroup; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopIndividualBusinessesDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopIndividualBusinessesDAO.java index ccc4f05..59c6d35 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopIndividualBusinessesDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopIndividualBusinessesDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.business.CereShopIndividualBusinesses; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereShopIndividualBusinesses; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopOtherOrganizationsDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopOtherOrganizationsDAO.java index dfbaab3..a3705cd 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopOtherOrganizationsDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopOtherOrganizationsDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.business.CereShopOtherOrganizations; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereShopOtherOrganizations; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopPersonalDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopPersonalDAO.java index 6c59780..59da547 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopPersonalDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopPersonalDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.business.CereShopPersonal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.business.CereShopPersonal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRecruitDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRecruitDAO.java index e25c925..895ed00 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRecruitDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRecruitDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopRecruit; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopRecruit; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRelationshipDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRelationshipDAO.java index 61aee88..5721d42 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRelationshipDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopRelationshipDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopRelationship; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopRelationship; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java index 399ac3c..24c7e6e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopReturnDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopReturn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopReturn; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopVisitDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopVisitDAO.java index c490ef6..1922e18 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopVisitDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopVisitDAO.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.dao.shop; -import com.shop.cereshop.commons.domain.shop.CereShopVisit; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.shop.CereShopVisit; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopWithdrawalDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopWithdrawalDAO.java index fb03a6b..1a39530 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopWithdrawalDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/shop/CereShopWithdrawalDAO.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.dao.shop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shop.cereshop.admin.param.withdrawal.WithdrawalGetAllParam; import com.shop.cereshop.commons.domain.shop.CereShopWithdrawal; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/exception/GlobalExceptionHandler.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/exception/GlobalExceptionHandler.java index b880d85..55a7adb 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/exception/GlobalExceptionHandler.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/exception/GlobalExceptionHandler.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.admin.exception; +import com.shop.cereshop.admin.utils.ContextUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.result.Result; @@ -15,7 +16,6 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -import com.shop.cereshop.admin.utils.ContextUtil; import javax.servlet.http.HttpServletRequest; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/aliyun/impl/AliyunMessageServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/aliyun/impl/AliyunMessageServiceImpl.java index ed2a16d..3eb4488 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/aliyun/impl/AliyunMessageServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/aliyun/impl/AliyunMessageServiceImpl.java @@ -10,13 +10,9 @@ import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; -import com.google.gson.Gson; -import com.shop.cereshop.admin.config.ConstantProperties; import com.shop.cereshop.admin.message.service.aliyun.AliyunMessageService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/miaoxin/impl/MiaoxinMessageServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/miaoxin/impl/MiaoxinMessageServiceImpl.java index 4705b89..66bbe64 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/miaoxin/impl/MiaoxinMessageServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/message/service/miaoxin/impl/MiaoxinMessageServiceImpl.java @@ -8,7 +8,6 @@ package com.shop.cereshop.admin.message.service.miaoxin.impl; import com.alibaba.fastjson.JSONObject; import com.shop.cereshop.admin.message.sdk.MiaoxinSmsClient; import com.shop.cereshop.admin.message.service.miaoxin.MiaoxinMessageService; -import com.shop.cereshop.commons.constant.StringEnum; import com.shop.cereshop.commons.domain.message.MessageResult; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/ProductRanking.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/ProductRanking.java index 05b1dfe..41300f6 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/ProductRanking.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/ProductRanking.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.page.activity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/Proportion.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/Proportion.java index 0615360..844d842 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/Proportion.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/activity/Proportion.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.page.activity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import java.math.BigDecimal; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/after/After.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/after/After.java index 99228ce..2e3ec8f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/after/After.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/after/After.java @@ -5,7 +5,6 @@ */ package com.shop.cereshop.admin.page.after; -import com.shop.cereshop.commons.poi.export.ExcelResources; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/business/BusinessGetAll.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/business/BusinessGetAll.java index 07055c4..7ee4b37 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/business/BusinessGetAll.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/business/BusinessGetAll.java @@ -5,7 +5,6 @@ */ package com.shop.cereshop.admin.page.business; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.shop.cereshop.commons.domain.business.CerePlatformBusiness; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/discount/DiscountData.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/discount/DiscountData.java index e573c5b..2d5a01d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/discount/DiscountData.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/discount/DiscountData.java @@ -13,7 +13,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; /** * 平台限时折扣活动数据效果 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/label/PlatformLabel.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/label/PlatformLabel.java index cf662a9..a38a147 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/label/PlatformLabel.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/label/PlatformLabel.java @@ -7,6 +7,7 @@ package com.shop.cereshop.admin.page.label; import com.shop.cereshop.commons.domain.label.CerePlatformLabel; import lombok.Data; + import java.util.List; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/member/MemberLevel.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/member/MemberLevel.java index e71b191..9451bc1 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/member/MemberLevel.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/member/MemberLevel.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/order/ShopOrderAfter.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/order/ShopOrderAfter.java index 5722ac0..d39fac2 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/order/ShopOrderAfter.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/order/ShopOrderAfter.java @@ -5,14 +5,10 @@ */ package com.shop.cereshop.admin.page.order; -import com.shop.cereshop.admin.page.product.Product; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - /** * 订单返回数据实体类 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/MenuButton.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/MenuButton.java index 76b0772..1c67ec7 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/MenuButton.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/MenuButton.java @@ -7,13 +7,13 @@ package com.shop.cereshop.admin.page.permission; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.google.gson.Gson; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -79,35 +79,26 @@ public class MenuButton { private List buttons; /** - * 名称Json - */ - @ApiModelProperty(value = "名称Json") - private String permissionNameJson; - - /** * 名称Map */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map permissionNameMap; + private Map langInfoMap; public void initData(){ - if(permissionNameMap == null){ - permissionNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(permissionNameMap)) { - if(StringUtils.isNotEmpty(permissionNameJson)){ - permissionNameMap = new Gson().fromJson(permissionNameJson, Map.class); - } - if(CollectionUtils.isEmpty(permissionNameMap)){ - permissionNameMap.put("zh", permissionName); + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setPermissionName(langInfoMap.get(defaultLangType).getPermissionName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setPermissionName(langInfoMap.get(LangUtil.ZH).getPermissionName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setPermissionName(langInfoMap.get(LangUtil.EN).getPermissionName()); + } else { + setPermissionName(langInfoMap.entrySet().stream().findFirst().get().getValue().getPermissionName()); } } - if(permissionNameMap.containsKey("zh")){ - permissionName = permissionNameMap.get("zh"); - }else if(permissionNameMap.containsKey("en")){ - permissionName = permissionNameMap.get("en"); - } } - } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/Permission.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/Permission.java index ce90f59..ad44952 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/Permission.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/permission/Permission.java @@ -7,21 +7,15 @@ package com.shop.cereshop.admin.page.permission; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.shop.cereshop.commons.domain.permission.PermissionNameAttr; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; /** * 权限返回数据实体类 @@ -97,35 +91,28 @@ public class Permission { private List buttonPermissions; /** - * 名称Json - */ - @ApiModelProperty(value = "名称Json") - private String permissionNameJson; - - /** * 名称Map */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map permissionNameMap; + private Map langInfoMap; + public void initData(){ - if(permissionNameMap == null){ - permissionNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(permissionNameMap)) { - if(StringUtils.isNotEmpty(permissionNameJson)){ - permissionNameMap = new Gson().fromJson(permissionNameJson, Map.class); - } - if(CollectionUtils.isEmpty(permissionNameMap)){ - permissionNameMap.put("zh", permissionName); + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setPermissionName(langInfoMap.get(defaultLangType).getPermissionName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setPermissionName(langInfoMap.get(LangUtil.ZH).getPermissionName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setPermissionName(langInfoMap.get(LangUtil.EN).getPermissionName()); + } else { + setPermissionName(langInfoMap.entrySet().stream().findFirst().get().getValue().getPermissionName()); } } - if(permissionNameMap.containsKey("zh")){ - permissionName = permissionNameMap.get("zh"); - }else if(permissionNameMap.containsKey("en")){ - permissionName = permissionNameMap.get("en"); - } } } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/Polite.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/Polite.java index d7ddce0..f94d3bd 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/Polite.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/Polite.java @@ -5,14 +5,12 @@ */ package com.shop.cereshop.admin.page.polite; -import com.shop.cereshop.commons.domain.platformtool.CerePlatformPoliteActivity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; /** * 支付有礼活动列表数据 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteData.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteData.java index 54ac275..a824c56 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteData.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteData.java @@ -6,14 +6,11 @@ package com.shop.cereshop.admin.page.polite; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.platformtool.CerePlatformPoliteActivity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; /** * 活动数据 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteDataDetail.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteDataDetail.java index b486653..fff5e1a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteDataDetail.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/polite/PoliteDataDetail.java @@ -5,13 +5,11 @@ */ package com.shop.cereshop.admin.page.polite; -import com.shop.cereshop.commons.domain.platformtool.CerePlatformPoliteActivity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 领取明细 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/SkuNameParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/SkuNameParam.java index 6afa0ce..9c29a62 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/SkuNameParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/SkuNameParam.java @@ -6,13 +6,11 @@ package com.shop.cereshop.admin.page.product; import com.shop.cereshop.commons.constant.IntegerEnum; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillData.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillData.java index e16dd7f..f7f8a41 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillData.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillData.java @@ -5,7 +5,6 @@ */ package com.shop.cereshop.admin.page.seckill; -import com.shop.cereshop.admin.page.shop.Shop; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.shop.ShopDataDetail; import io.swagger.annotations.ApiModel; @@ -14,7 +13,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; /** * 平台秒杀活动数据效果 diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillShopProduct.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillShopProduct.java index 0b01214..a0e821b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillShopProduct.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/seckill/SeckillShopProduct.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * 商品返回数据实体类 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetProductsParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetProductsParam.java index 2c0cf68..e6b034b 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetProductsParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetProductsParam.java @@ -6,15 +6,10 @@ package com.shop.cereshop.admin.param.activity; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.activity.CerePlatformActivityDetail; -import com.shop.cereshop.commons.utils.EmptyUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - /** * 营销活动接收参数实体类 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetShopsParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetShopsParam.java index 0887943..5deccbd 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetShopsParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/activity/ActivityGetShopsParam.java @@ -5,17 +5,11 @@ */ package com.shop.cereshop.admin.param.activity; -import com.shop.cereshop.commons.constant.IntegerEnum; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.activity.CerePlatformActivityDetail; -import com.shop.cereshop.commons.utils.EmptyUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - /** * 营销活动接收参数实体类 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoAllParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoAllParam.java new file mode 100644 index 0000000..02c641b --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoAllParam.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.param.lang; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.common.PageParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + * 获取语言包列表请求 + */ +@Data +@ApiModel(value = "LangInfoAllParam", description = "获取语言包列表请求") +public class LangInfoAllParam extends PageParam { + + /** + * 多语言主键 + */ + @ApiModelProperty(value = "多语言主键") + private String langKey; + + /** + * 中文 + */ + @ApiModelProperty(value = "中文") + private String langZh; + + + /** + * 英语 + */ + @ApiModelProperty(value = "英语") + private String langEn; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoDeleteParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoDeleteParam.java new file mode 100644 index 0000000..6cf4774 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/lang/LangInfoDeleteParam.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.admin.param.lang; + +import com.shop.cereshop.commons.domain.common.PageParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 获取语言包列表请求 + */ +@Data +@ApiModel(value = "LangInfoDeleteParam", description = "获取语言包列表请求") +public class LangInfoDeleteParam extends PageParam { + + /** + * 多语言主键 + */ + @ApiModelProperty(value = "多语言主键") + private Long id; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MemberLevelgetByIdParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MemberLevelgetByIdParam.java index 3d7eade..624fc31 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MemberLevelgetByIdParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MemberLevelgetByIdParam.java @@ -9,10 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * 编辑会员等级请求 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MembershipUpdateParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MembershipUpdateParam.java index dcc5bc9..9f2d125 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MembershipUpdateParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/member/MembershipUpdateParam.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; - /** * 编辑会员权益请求 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionSaveParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionSaveParam.java index 947d82c..50d966e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionSaveParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionSaveParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.admin.param.permission; +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -79,5 +81,6 @@ public class PermissionSaveParam { * 名称Map */ @ApiModelProperty(value = "名称Map") - private Map permissionNameMap; + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionUpdateParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionUpdateParam.java index c85d829..3979b34 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionUpdateParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/permission/PermissionUpdateParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.admin.param.permission; +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -82,5 +84,6 @@ public class PermissionUpdateParam { * 名称Map */ @ApiModelProperty(value = "名称Map") - private Map permissionNameMap; + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/sharesetting/ShareSettingSaveParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/sharesetting/ShareSettingSaveParam.java index e18f930..97afc62 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/sharesetting/ShareSettingSaveParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/sharesetting/ShareSettingSaveParam.java @@ -5,13 +5,10 @@ */ package com.shop.cereshop.admin.param.sharesetting; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.math.BigDecimal; /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/withdrawal/WithdrawalGetAllParam.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/withdrawal/WithdrawalGetAllParam.java index 18c2a73..30a35a8 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/withdrawal/WithdrawalGetAllParam.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/param/withdrawal/WithdrawalGetAllParam.java @@ -6,13 +6,10 @@ package com.shop.cereshop.admin.param.withdrawal; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.utils.EmptyUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * 获取提现申请列表请求 */ diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/weixin/service/WxPayService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/weixin/service/WxPayService.java index 5d7b6ca..730f732 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/weixin/service/WxPayService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/weixin/service/WxPayService.java @@ -6,10 +6,6 @@ package com.shop.cereshop.admin.pay.weixin.service; import com.shop.cereshop.admin.pay.PayService; -import com.shop.cereshop.commons.exception.CoBusinessException; - -import java.math.BigDecimal; -import java.util.Map; public interface WxPayService extends PayService { } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CereActivitySignService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CereActivitySignService.java index 34c7763..6203fb6 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CereActivitySignService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CereActivitySignService.java @@ -8,7 +8,6 @@ package com.shop.cereshop.admin.service.activity; import com.shop.cereshop.admin.page.finance.BondCount; import com.shop.cereshop.admin.param.finance.BondParam; import com.shop.cereshop.commons.domain.activity.CereActivitySign; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.exception.CoBusinessException; public interface CereActivitySignService { diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CerePlatformActivityService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CerePlatformActivityService.java index e569185..fcfddb3 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CerePlatformActivityService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/CerePlatformActivityService.java @@ -8,13 +8,12 @@ package com.shop.cereshop.admin.service.activity; import com.shop.cereshop.admin.page.activity.*; import com.shop.cereshop.admin.page.canvas.ShopGroupWorkUDetail; import com.shop.cereshop.admin.page.canvas.ToolProduct; +import com.shop.cereshop.admin.param.activity.*; import com.shop.cereshop.admin.param.canvas.CanvasCouponParam; import com.shop.cereshop.admin.param.canvas.RenovationParam; import com.shop.cereshop.commons.domain.activity.CereActivitySign; import com.shop.cereshop.commons.domain.activity.CerePlatformActivity; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.admin.param.activity.*; -import com.shop.cereshop.commons.domain.log.CerePlatformLog; import com.shop.cereshop.commons.domain.pay.CerePayLog; import com.shop.cereshop.commons.domain.shop.ShopDetail; import com.shop.cereshop.commons.domain.user.CerePlatformUser; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/impl/CereActivitySignServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/impl/CereActivitySignServiceImpl.java index dd27651..e9ac34c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/impl/CereActivitySignServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/activity/impl/CereActivitySignServiceImpl.java @@ -10,7 +10,6 @@ import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.activity.CereActivitySignDAO; import com.shop.cereshop.admin.page.finance.BondCount; import com.shop.cereshop.admin.page.finance.ShopBond; -import com.shop.cereshop.admin.page.shop.Shop; import com.shop.cereshop.admin.param.finance.BondParam; import com.shop.cereshop.admin.redis.service.api.StringRedisService; import com.shop.cereshop.admin.service.activity.CereActivitySignService; @@ -23,7 +22,6 @@ import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.pay.CerePayLog; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; -import com.shop.cereshop.commons.utils.ProjectUtil; import com.shop.cereshop.commons.utils.TimeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/after/CereOrderAfterService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/after/CereOrderAfterService.java index b7d2815..62ec118 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/after/CereOrderAfterService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/after/CereOrderAfterService.java @@ -8,11 +8,11 @@ package com.shop.cereshop.admin.service.after; import com.shop.cereshop.admin.page.after.AfterBuyer; import com.shop.cereshop.admin.page.after.AfterDetail; import com.shop.cereshop.admin.page.after.AfterDilevery; -import com.shop.cereshop.commons.domain.after.CereOrderAfter; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.after.AfterGetAllParam; import com.shop.cereshop.admin.param.after.AfterGetDileveryParam; import com.shop.cereshop.admin.param.after.AfterhandleParam; +import com.shop.cereshop.commons.domain.after.CereOrderAfter; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasCustomService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasCustomService.java index 3f22e82..663aa9c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasCustomService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasCustomService.java @@ -5,17 +5,12 @@ */ package com.shop.cereshop.admin.service.canvas; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.param.canvas.CanvasPageParam; -import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvas; import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvasCustom; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; -import java.util.List; - public interface CerePlatformCanvasCustomService { /** diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasService.java index bae04d9..4866bde 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/CerePlatformCanvasService.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.service.canvas; import com.shop.cereshop.admin.param.canvas.CanvasPageParam; import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvas; -import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvasCustom; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasCustomServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasCustomServiceImpl.java index 21b1f9a..f6a4894 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasCustomServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasCustomServiceImpl.java @@ -11,7 +11,6 @@ import com.shop.cereshop.admin.dao.canvas.CerePlatformCanvasCustomDAO; import com.shop.cereshop.admin.dao.canvas.CerePlatformCanvasDAO; import com.shop.cereshop.admin.param.canvas.CanvasPageParam; import com.shop.cereshop.admin.service.canvas.CerePlatformCanvasCustomService; -import com.shop.cereshop.admin.service.canvas.CerePlatformCanvasService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvas; import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvasCustom; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasServiceImpl.java index d013ee5..0ec2228 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/canvas/impl/CerePlatformCanvasServiceImpl.java @@ -8,15 +8,12 @@ package com.shop.cereshop.admin.service.canvas.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.canvas.CerePlatformCanvasDAO; -import com.shop.cereshop.admin.page.canvas.CanvasCoupon; import com.shop.cereshop.admin.param.canvas.CanvasPageParam; import com.shop.cereshop.admin.service.canvas.CerePlatformCanvasService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvas; -import com.shop.cereshop.commons.domain.canvas.CerePlatformCanvasCustom; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.log.CerePlatformLog; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/credit/impl/CereCreditRecordServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/credit/impl/CereCreditRecordServiceImpl.java index e1decdf..18ef15f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/credit/impl/CereCreditRecordServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/credit/impl/CereCreditRecordServiceImpl.java @@ -13,7 +13,6 @@ import com.shop.cereshop.admin.param.credit.CreditRecordGetAllParam; import com.shop.cereshop.admin.service.credit.CereCreditRecordService; import com.shop.cereshop.admin.utils.EncodeUtil; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/CerePlatformDictService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/CerePlatformDictService.java index 50e3dd7..71b93c0 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/CerePlatformDictService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/CerePlatformDictService.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.service.dict; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.dict.*; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.dict.CerePlatformDict; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/impl/CerePlatformDictServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/impl/CerePlatformDictServiceImpl.java index 28ca047..cc26b9a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/impl/CerePlatformDictServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/dict/impl/CerePlatformDictServiceImpl.java @@ -8,11 +8,11 @@ package com.shop.cereshop.admin.service.dict.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.dict.CerePlatformDictDAO; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.dict.*; import com.shop.cereshop.admin.param.express.ExpressImort; import com.shop.cereshop.admin.service.dict.CerePlatformDictService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.dict.CerePlatformDict; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/CerePlatformLabelService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/CerePlatformLabelService.java index 4872331..754e817 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/CerePlatformLabelService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/CerePlatformLabelService.java @@ -5,8 +5,8 @@ */ package com.shop.cereshop.admin.service.label; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.label.*; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.label.CereBuyerLabel; import com.shop.cereshop.commons.domain.label.CerePlatformLabel; import com.shop.cereshop.commons.domain.label.PlatformLabel; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/impl/CerePlatformLabelServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/impl/CerePlatformLabelServiceImpl.java index 816dd25..ce1dc0a 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/impl/CerePlatformLabelServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/label/impl/CerePlatformLabelServiceImpl.java @@ -8,12 +8,12 @@ package com.shop.cereshop.admin.service.label.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.label.CerePlatformLabelDAO; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.label.*; import com.shop.cereshop.admin.service.label.CereBuyerLabelService; import com.shop.cereshop.admin.service.label.CerePlatformLabelService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.commons.constant.IntegerEnum; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.label.CereBuyerLabel; import com.shop.cereshop.commons.domain.label.CerePlatformLabel; import com.shop.cereshop.commons.domain.label.PlatformLabel; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/CerePlatformLangInfoService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/CerePlatformLangInfoService.java new file mode 100644 index 0000000..6792811 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/CerePlatformLangInfoService.java @@ -0,0 +1,35 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.lang; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.admin.param.lang.LangInfoAllParam; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformLangInfoService extends IService { + + + int insert(CerePlatformLangInfo brand); + + int update(CerePlatformLangInfo brand); + + int delete(Long id); + + CerePlatformLangInfo getById(Long id); + + Page getAll(LangInfoAllParam param); + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/impl/CerePlatformLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/impl/CerePlatformLangInfoServiceImpl.java new file mode 100644 index 0000000..7a12bb7 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/lang/impl/CerePlatformLangInfoServiceImpl.java @@ -0,0 +1,72 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.lang.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageHelper; +import com.shop.cereshop.admin.dao.lang.CerePlatformLangInfoDAO; +import com.shop.cereshop.admin.param.lang.LangInfoAllParam; +import com.shop.cereshop.commons.domain.brand.Brand; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; +import com.shop.cereshop.admin.service.lang.CerePlatformLangInfoService; + +import com.shop.cereshop.commons.utils.TimeUtils; +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformLangInfoServiceImpl extends ServiceImpl implements CerePlatformLangInfoService { + @Override + public int insert(CerePlatformLangInfo brand) { + brand.setCreateTime(TimeUtils.yyMMddHHmmss()); + return baseMapper.insert(brand); + } + + @Override + public int update(CerePlatformLangInfo brand) { + brand.setUpdateTime(TimeUtils.yyMMddHHmmss()); + return baseMapper.updateById(brand); + } + + @Override + public int delete(Long id) { + return baseMapper.deleteById(id); + } + + @Override + public CerePlatformLangInfo getById(Long id) { + return baseMapper.selectById(id); + } + + @Override + public Page getAll(LangInfoAllParam param) { + com.github.pagehelper.Page page = PageHelper.startPage(param.getPage(), param.getPageSize()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotEmpty(param.getLangKey()),CerePlatformLangInfo::getLangKey, param.getLangKey()); + lqw.like(StringUtils.isNotEmpty(param.getLangZh()),CerePlatformLangInfo::getLangZh, param.getLangZh()); + lqw.like(StringUtils.isNotEmpty(param.getLangEn()),CerePlatformLangInfo::getLangEn, param.getLangEn()); + lqw.orderByDesc(CerePlatformLangInfo::getCreateTime); + List brandList = baseMapper.selectList(lqw); + return new Page<>(brandList, page.getTotal()); + } +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/log/CerePlatformLogService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/log/CerePlatformLogService.java index a8c12d4..8bac647 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/log/CerePlatformLogService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/log/CerePlatformLogService.java @@ -5,12 +5,9 @@ */ package com.shop.cereshop.admin.service.log; -import com.shop.cereshop.commons.domain.log.CerePlatformLog; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; -import java.util.function.Consumer; - public interface CerePlatformLogService { void addLog(CerePlatformUser user, String module, String operation, String describe, String id, String time) throws CoBusinessException; } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/CerePlatformMemberLevelService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/CerePlatformMemberLevelService.java index ad5bec8..7d38397 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/CerePlatformMemberLevelService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/CerePlatformMemberLevelService.java @@ -11,7 +11,6 @@ import com.shop.cereshop.admin.param.member.MemberLevelUpdateParam; import com.shop.cereshop.admin.param.member.MemberLevelgetByIdParam; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.member.CerePlatformMemberLevel; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMemberLevelServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMemberLevelServiceImpl.java index e370a78..8baa5f7 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMemberLevelServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMemberLevelServiceImpl.java @@ -23,7 +23,6 @@ import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; import com.shop.cereshop.commons.utils.TimeUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.http.ConnectionReuseStrategy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMembershipServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMembershipServiceImpl.java index 8c9aa74..529d06c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMembershipServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/member/impl/CerePlatformMembershipServiceImpl.java @@ -16,11 +16,9 @@ import com.shop.cereshop.admin.service.member.CerePlatformMembershipService; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.common.PageParam; -import com.shop.cereshop.commons.domain.dict.CerePlatformDict; import com.shop.cereshop.commons.domain.member.CerePlatformMembership; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; -import com.shop.cereshop.commons.utils.EmptyUtils; import com.shop.cereshop.commons.utils.TimeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/CerePlatfromMessageService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/CerePlatfromMessageService.java index 356b753..0d8362f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/CerePlatfromMessageService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/CerePlatfromMessageService.java @@ -5,11 +5,11 @@ */ package com.shop.cereshop.admin.service.message; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.message.MessageDeleteParam; import com.shop.cereshop.admin.param.message.MessageGetAllParam; import com.shop.cereshop.admin.param.message.MessageSaveParam; import com.shop.cereshop.admin.param.message.MessageUpdateParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.message.CerePlatfromMessage; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/impl/CerePlatfromMessageServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/impl/CerePlatfromMessageServiceImpl.java index c518809..502e188 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/impl/CerePlatfromMessageServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/message/impl/CerePlatfromMessageServiceImpl.java @@ -8,13 +8,13 @@ package com.shop.cereshop.admin.service.message.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.message.CerePlatfromMessageDAO; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.message.MessageDeleteParam; import com.shop.cereshop.admin.param.message.MessageGetAllParam; import com.shop.cereshop.admin.param.message.MessageSaveParam; import com.shop.cereshop.admin.param.message.MessageUpdateParam; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.admin.service.message.CerePlatfromMessageService; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.message.CerePlatfromMessage; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/CereNoticeService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/CereNoticeService.java index 85176fc..c4999df 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/CereNoticeService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/CereNoticeService.java @@ -9,7 +9,6 @@ import com.shop.cereshop.admin.param.notice.NoticeGetAllParam; import com.shop.cereshop.admin.param.notice.NoticeIdParam; import com.shop.cereshop.admin.param.notice.NoticeParam; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.common.PageParam; import com.shop.cereshop.commons.domain.notice.CereNotice; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/impl/CereNoticeServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/impl/CereNoticeServiceImpl.java index 2fb84b7..c032962 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/impl/CereNoticeServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/notice/impl/CereNoticeServiceImpl.java @@ -14,7 +14,6 @@ import com.shop.cereshop.admin.param.notice.NoticeParam; import com.shop.cereshop.admin.service.notice.CereNoticeService; import com.shop.cereshop.commons.constant.IntegerEnum; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.common.PageParam; import com.shop.cereshop.commons.domain.notice.CereNotice; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/CerePlatformPermissionLangInfoService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/CerePlatformPermissionLangInfoService.java new file mode 100644 index 0000000..4674e98 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/CerePlatformPermissionLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.permission; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformPermissionLangInfoService extends IService { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CereBusinessPermissionServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CereBusinessPermissionServiceImpl.java index e5667f0..274da0c 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CereBusinessPermissionServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CereBusinessPermissionServiceImpl.java @@ -6,13 +6,14 @@ package com.shop.cereshop.admin.service.permission.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; import com.shop.cereshop.admin.dao.business.CereBusinessUserDAO; import com.shop.cereshop.admin.dao.business.CerePlatformBusinessUserDAO; import com.shop.cereshop.admin.dao.permission.CereBusinessPermissionDAO; import com.shop.cereshop.admin.dao.permission.CerePlatformPermissionDAO; +import com.shop.cereshop.admin.dao.permission.CerePlatformPermissionLangInfoDAO; import com.shop.cereshop.admin.dao.role.CerePlatformRoleDAO; import com.shop.cereshop.admin.dao.role.CerePlatformRolePermissionDAO; import com.shop.cereshop.admin.page.permission.MenuButton; @@ -29,6 +30,7 @@ import com.shop.cereshop.commons.constant.LongEnum; import com.shop.cereshop.commons.constant.StringEnum; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import com.shop.cereshop.commons.domain.role.CerePlatformRole; import com.shop.cereshop.commons.domain.role.CerePlatformRolePermission; import com.shop.cereshop.commons.domain.user.CerePlatformUser; @@ -55,6 +57,9 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission private CereBusinessPermissionDAO cereBusinessPermissionDAO; @Autowired + private CerePlatformPermissionLangInfoDAO cerePlatformPermissionLangInfoDAO; + + @Autowired private CerePlatformBusinessUserDAO cerePlatformBusinessUserDAO; @Autowired @@ -87,8 +92,8 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission permission.setIcon(param.getIcon()); permission.setResourceType(param.getResourceType()); permission.setSort(param.getSort()); + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); if (EmptyUtils.isEmpty(permission.getPermissionPid())) { //如果没有父节点id,新增根节点 permission.setPermissionPid(LongEnum.getByName("根节点")); @@ -97,6 +102,12 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission permission.setProject(LongEnum.ZERO.getCode()); cereBusinessPermissionDAO.insert(permission); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user, "权限管理", "平台端操作", "添加权限", String.valueOf(permission.getPermissionId()), time); } @@ -116,9 +127,16 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission permission.setSort(param.getSort()); permission.setPermissionId(param.getPermissionId()); permission.setUpdateTime(time); + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); - cereBusinessPermissionDAO.updateByPrimaryKeySelective(permission); + cerePlatformPermissionDAO.updateByPrimaryKeySelective(permission); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permission.getPermissionId())); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user, "权限管理", "平台端操作", "修改权限", String.valueOf(permission.getPermissionId()), time); } @@ -128,6 +146,8 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission public void delete(PermissionDeleteParam param, CerePlatformUser user) throws CoBusinessException { String time = TimeUtils.yyMMddHHmmss(); cereBusinessPermissionDAO.deleteByPrimaryKey(param.getPermissionId()); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,param.getPermissionId())); + //新增日志 cerePlatformLogService.addLog(user, "权限管理", "平台端操作", "删除权限", String.valueOf(param.getPermissionId()), time); } @@ -135,6 +155,14 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission @Override public CerePlatformPermission getById(Long permissionId) throws CoBusinessException { CerePlatformPermission cerePlatformPermission = cereBusinessPermissionDAO.getById(permissionId); + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permissionId)); + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(cerePlatformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : cerePlatformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + cerePlatformPermission.setLangInfoMap(cerePlatformPermissionLangInfoMap); cerePlatformPermission.initData(); return cerePlatformPermission; } @@ -146,6 +174,44 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission List list = cereBusinessPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(), param.getPermissionName()); //查询所有子节点菜单和按钮权限 List childs = cereBusinessPermissionDAO.findChilds(param.getPermissionName()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if (!EmptyUtils.isEmpty(list)) { Map map = new HashMap<>(); list.forEach((permission -> { @@ -168,6 +234,44 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission List list = cereBusinessPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(), null); //查询所有子节点菜单权限 List childs = cereBusinessPermissionDAO.findChilds(null); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if (!EmptyUtils.isEmpty(list)) { Map map = new HashMap<>(); list.forEach((permission -> { @@ -192,6 +296,59 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission List childs = cereBusinessPermissionDAO.findAllCatalogByUserIdAndResourceType(user.getPlatformUserId(), StringEnum.MENU.getCode()); //查询所有按钮权限 List buttons = cereBusinessPermissionDAO.findAllCatalogByUserIdAndResourceType(user.getPlatformUserId(), StringEnum.BUTTON.getCode()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(buttons.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0) + .distinct().collect(Collectors.toList()); + + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (MenuButton permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : buttons) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if (!EmptyUtils.isEmpty(list)) { Map map = new HashMap<>(); list.forEach((permission -> { @@ -220,6 +377,59 @@ public class CereBusinessPermissionServiceImpl implements CereBusinessPermission List childs = cereBusinessPermissionDAO.findAllCatalogByResourceType(StringEnum.MENU.getCode()); //查询所有按钮权限 List buttons = cereBusinessPermissionDAO.findAllCatalogByResourceType(StringEnum.BUTTON.getCode()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(buttons.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0) + .distinct().collect(Collectors.toList()); + + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (MenuButton permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : buttons) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if (!EmptyUtils.isEmpty(list)) { Map map = new HashMap<>(); list.forEach((permission -> { diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java new file mode 100644 index 0000000..d036bb3 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.permission.impl; + +import com.shop.cereshop.admin.dao.permission.CerePlatformPermissionLangInfoDAO; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.admin.service.permission.CerePlatformPermissionLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformPermissionLangInfoServiceImpl extends ServiceImpl implements CerePlatformPermissionLangInfoService { +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionServiceImpl.java index acc8141..682a835 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/CerePlatformPermissionServiceImpl.java @@ -5,10 +5,12 @@ */ package com.shop.cereshop.admin.service.permission.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; import com.shop.cereshop.admin.dao.permission.CerePlatformPermissionDAO; +import com.shop.cereshop.admin.dao.permission.CerePlatformPermissionLangInfoDAO; import com.shop.cereshop.admin.page.permission.MenuButton; import com.shop.cereshop.admin.page.permission.Meta; import com.shop.cereshop.admin.page.permission.Permission; @@ -26,6 +28,7 @@ import com.shop.cereshop.commons.constant.LongEnum; import com.shop.cereshop.commons.constant.StringEnum; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; @@ -36,10 +39,7 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -49,6 +49,9 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission private CerePlatformPermissionDAO cerePlatformPermissionDAO; @Autowired + private CerePlatformPermissionLangInfoDAO cerePlatformPermissionLangInfoDAO; + + @Autowired private CerePlatformLogService cerePlatformLogService; @Autowired @@ -61,14 +64,16 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission CerePlatformPermission permission=new CerePlatformPermission(); permission.setPermissionPid(param.getPermissionPid()); permission.setPermission(param.getPermission()); - permission.setPermissionName(param.getPermissionName()); permission.setPermissionUri(param.getPermissionUri()); permission.setDescribe(param.getDescribe()); permission.setIcon(param.getIcon()); permission.setResourceType(param.getResourceType()); permission.setSort(param.getSort()); + if(param.getLangInfoMap().size() <= 0){ + throw new CoBusinessException("10000","请输入菜单名称", ""); + } + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); if(EmptyUtils.isEmpty(permission.getPermissionPid())){ //如果没有父节点id,新增根节点 permission.setPermissionPid(LongEnum.getByName("根节点")); @@ -77,6 +82,12 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission permission.setProject(LongEnum.PLATFORM.getCode()); cerePlatformPermissionDAO.insert(permission); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","添加权限",String.valueOf(permission.getPermissionId()),time); } @@ -96,9 +107,19 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission permission.setSort(param.getSort()); permission.setPermissionId(param.getPermissionId()); permission.setUpdateTime(time); + if(param.getLangInfoMap().size() <= 0){ + throw new CoBusinessException("10000","请输入菜单名称", ""); + } + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); cerePlatformPermissionDAO.updateByPrimaryKeySelective(permission); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permission.getPermissionId())); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","修改权限",String.valueOf(permission.getPermissionId()),time); } @@ -110,6 +131,8 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission cerePlatformPermissionDAO.deleteByPrimaryKey(param.getPermissionId()); //删除角色关联菜单数据 cerePlatformRolePermissionService.deleteByPermissionId(param.getPermissionId()); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,param.getPermissionId())); + //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","删除权限",String.valueOf(param.getPermissionId()),time); } @@ -117,6 +140,15 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission @Override public CerePlatformPermission getById(Long permissionId) throws CoBusinessException { CerePlatformPermission cerePlatformPermission = cerePlatformPermissionDAO.getById(permissionId); + + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permissionId)); + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(cerePlatformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : cerePlatformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + cerePlatformPermission.setLangInfoMap(cerePlatformPermissionLangInfoMap); cerePlatformPermission.initData(); return cerePlatformPermission; } @@ -128,6 +160,44 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List list=cerePlatformPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(),param.getPermissionName()); //查询所有子节点菜单和按钮权限 List childs=cerePlatformPermissionDAO.findChilds(param.getPermissionName()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + //查询所有 if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { @@ -150,6 +220,45 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List list=cerePlatformPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(),null); //查询所有子节点菜单权限 List childs=cerePlatformPermissionDAO.findChilds(null); + + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { @@ -174,6 +283,60 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List childs=cerePlatformPermissionDAO.findAllCatalogByUserIdAndResourceType(user.getPlatformUserId(),StringEnum.MENU.getCode()); //查询所有按钮权限 List buttons=cerePlatformPermissionDAO.findAllCatalogByUserIdAndResourceType(user.getPlatformUserId(),StringEnum.BUTTON.getCode()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(buttons.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0) + .distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (MenuButton permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : buttons) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { @@ -202,6 +365,60 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List childs=cerePlatformPermissionDAO.findAllCatalogByResourceType(StringEnum.MENU.getCode()); //查询所有按钮权限 List buttons=cerePlatformPermissionDAO.findAllCatalogByResourceType(StringEnum.BUTTON.getCode()); + + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(buttons.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0) + .distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (MenuButton permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : buttons) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/PlatformPermissionLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/PlatformPermissionLangInfoServiceImpl.java new file mode 100644 index 0000000..b2c2505 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/permission/impl/PlatformPermissionLangInfoServiceImpl.java @@ -0,0 +1,23 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.permission.impl; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-23 + */ +@Slf4j +@Service +public class PlatformPermissionLangInfoServiceImpl { +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformDiscountService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformDiscountService.java index bedfa50..e01c2a0 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformDiscountService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformDiscountService.java @@ -7,14 +7,11 @@ package com.shop.cereshop.admin.service.platformtool; import com.shop.cereshop.admin.page.canvas.CanvasPlatformDiscount; import com.shop.cereshop.admin.page.discount.DiscountData; -import com.shop.cereshop.admin.page.seckill.SeckillData; import com.shop.cereshop.admin.param.canvas.RenovationParam; import com.shop.cereshop.admin.param.discount.*; -import com.shop.cereshop.admin.param.seckill.*; import com.shop.cereshop.commons.domain.activity.CereActivitySign; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.platformtool.CerePlatformDiscount; -import com.shop.cereshop.commons.domain.platformtool.CerePlatformSeckill; import com.shop.cereshop.commons.domain.shop.ShopDataDetail; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformSeckillService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformSeckillService.java index ed47cd1..343484d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformSeckillService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/CerePlatformSeckillService.java @@ -11,7 +11,6 @@ import com.shop.cereshop.admin.param.canvas.RenovationParam; import com.shop.cereshop.admin.param.seckill.*; import com.shop.cereshop.commons.domain.activity.CereActivitySign; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.common.PageParam; import com.shop.cereshop.commons.domain.platformtool.CerePlatformSeckill; import com.shop.cereshop.commons.domain.shop.ShopDataDetail; import com.shop.cereshop.commons.domain.user.CerePlatformUser; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/impl/CerePlatformPoliteServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/impl/CerePlatformPoliteServiceImpl.java index 44719c6..8c2ad8d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/impl/CerePlatformPoliteServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/platformtool/impl/CerePlatformPoliteServiceImpl.java @@ -36,7 +36,6 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.sql.Time; import java.util.List; @Service diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyLangInfoService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyLangInfoService.java new file mode 100644 index 0000000..e411b6a --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CereProductClassifyLangInfoService extends IService { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyService.java index 15faae9..5f18c12 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereProductClassifyService.java @@ -5,10 +5,10 @@ */ package com.shop.cereshop.admin.service.product; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.product.ClassifyDeleteParam; import com.shop.cereshop.admin.param.product.ClassifyGetAllParam; import com.shop.cereshop.admin.param.product.ClassifyLevelParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.product.CereProductClassify; import com.shop.cereshop.commons.domain.product.Classify; import com.shop.cereshop.commons.domain.user.CerePlatformUser; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereShopProductLangInfoService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereShopProductLangInfoService.java new file mode 100644 index 0000000..afee7fe --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereShopProductLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +/** + *

+ * 业务接口 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +public interface CereShopProductLangInfoService extends IService { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereSkuNameLangInfoService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereSkuNameLangInfoService.java new file mode 100644 index 0000000..666a9c4 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/CereSkuNameLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +/** + *

+ * 业务接口 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +public interface CereSkuNameLangInfoService extends IService { + +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyLangInfoServiceImpl.java new file mode 100644 index 0000000..499ff85 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product.impl; + +import com.shop.cereshop.admin.dao.product.CereProductClassifyLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; +import com.shop.cereshop.admin.service.product.CereProductClassifyLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CereProductClassifyLangInfoServiceImpl extends ServiceImpl implements CereProductClassifyLangInfoService { +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyServiceImpl.java index 2f2445e..37f248e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductClassifyServiceImpl.java @@ -5,21 +5,23 @@ */ package com.shop.cereshop.admin.service.product.impl; -import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; import com.shop.cereshop.admin.dao.product.CereProductClassifyDAO; import com.shop.cereshop.admin.param.product.ClassifyDeleteParam; import com.shop.cereshop.admin.param.product.ClassifyGetAllParam; import com.shop.cereshop.admin.param.product.ClassifyLevelParam; import com.shop.cereshop.admin.service.log.CerePlatformLogService; +import com.shop.cereshop.admin.service.product.CereProductClassifyLangInfoService; import com.shop.cereshop.admin.service.product.CereProductClassifyService; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.constant.IntegerEnum; import com.shop.cereshop.commons.constant.LongEnum; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.product.CereProductClassify; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; import com.shop.cereshop.commons.domain.product.CereShopProduct; import com.shop.cereshop.commons.domain.product.Classify; import com.shop.cereshop.commons.domain.user.CerePlatformUser; @@ -37,6 +39,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service public class CereProductClassifyServiceImpl implements CereProductClassifyService { @@ -45,6 +48,9 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic private CereProductClassifyDAO cereProductClassifyDAO; @Autowired + private CereProductClassifyLangInfoService cereProductClassifyLangInfoService; + + @Autowired private CerePlatformLogService cerePlatformLogService; @Override @@ -53,22 +59,33 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time= TimeUtils.yyMMddHHmmss(); //定义批量更新层级结构字段数组 List updates=new ArrayList<>(); + List updateIds=new ArrayList<>(); + List langInfoList = new ArrayList<>(); if(!EmptyUtils.isEmpty(param.getClassifies())){ //遍历一级类别 for (CereProductClassify classify:param.getClassifies()) { //新增一级类别数据 - addOneClassify(classify,time,updates); + addOneClassify(classify,time,updates, updateIds, langInfoList); } if(!EmptyUtils.isEmpty(updates)){ //批量更新分类层级结构 cereProductClassifyDAO.updateBatchLevelHierarchy(updates); } + if(!EmptyUtils.isEmpty(updateIds)){ + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, updateIds)); + } + if(CollectionUtils.isNotEmpty(langInfoList)) { + cereProductClassifyLangInfoService.saveBatch(langInfoList); + } } //新增日志 cerePlatformLogService.addLog(user,"商品类别","平台端操作","添加商品类别",null,time); } - private void addOneClassify(CereProductClassify classify, String time,List updates) throws CoBusinessException{ + private void addOneClassify(CereProductClassify classify, String time, + List updates, List updateIds, + List langInfoList) throws CoBusinessException{ if(EmptyUtils.isEmpty(classify.getClassifyName())){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_NAME_NULL); } @@ -81,10 +98,8 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic cereProductClassify.setLink(classify.getLink()); cereProductClassify.setProject(ProjectUtil.DEFAULT_PROJECT); cereProductClassify.setClassifyHierarchy("-"+classify.getClassifyName()); - cereProductClassify.setClassifyNameJson(classify.getClassifyNameJson()); - cereProductClassify.setClassifyNameMap(classify.getClassifyNameMap()); + cereProductClassify.setLangInfoMap(classify.getLangInfoMap()); cereProductClassify.initData(); - cereProductClassify.setClassifyNameJson(new Gson().toJson(cereProductClassify.getClassifyNameMap())); if(!EmptyUtils.isLongEmpty(classify.getClassifyId())){ //更新一级类别 cereProductClassify.setUpdateTime(time); @@ -97,17 +112,27 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic cereProductClassify.setClassifyLevelHierarchy("/"+cereProductClassify.getClassifyId()); updates.add(cereProductClassify); } + updateIds.add(cereProductClassify.getClassifyId()); + + for (Map.Entry productClassifyLangInfoEntry : cereProductClassify.getLangInfoMap().entrySet()) { + CereProductClassifyLangInfo productClassifyLangInfo = productClassifyLangInfoEntry.getValue(); + productClassifyLangInfo.setClassifyId(classify.getClassifyId()); + productClassifyLangInfo.setId(null); + langInfoList.add(productClassifyLangInfo); + } + if(!EmptyUtils.isEmpty(classify.getChilds())){ //新增子级类别 for (CereProductClassify productClassify:classify.getChilds()) { - addChildClaasify(cereProductClassify, - updates,time,productClassify,IntegerEnum.CLASSIFY_LEVEL_TWO.getCode()); + addChildClaasify(cereProductClassify, updates,updateIds,time,productClassify,IntegerEnum.CLASSIFY_LEVEL_TWO.getCode(), langInfoList); } } } private void addChildClaasify(CereProductClassify parent, List updates, - String time, CereProductClassify child,Integer level) throws CoBusinessException{ + List updateIds, + String time, CereProductClassify child,Integer level, + List langInfoList) throws CoBusinessException{ if(EmptyUtils.isEmpty(child.getClassifyName())){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_NAME_NULL); } @@ -120,10 +145,8 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic productClassify.setClassifyImage(child.getClassifyImage()); productClassify.setProject(ProjectUtil.DEFAULT_PROJECT); productClassify.setClassifyHierarchy(parent.getClassifyHierarchy()+"-"+child.getClassifyName()); - productClassify.setClassifyNameJson(child.getClassifyNameJson()); - productClassify.setClassifyNameMap(child.getClassifyNameMap()); + productClassify.setLangInfoMap(child.getLangInfoMap()); productClassify.initData(); - productClassify.setClassifyNameJson(new Gson().toJson(productClassify.getClassifyNameMap())); if(!EmptyUtils.isLongEmpty(child.getClassifyId())){ //更新子级类别 productClassify.setUpdateTime(time); @@ -136,10 +159,19 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic productClassify.setClassifyLevelHierarchy(parent.getClassifyLevelHierarchy()+"/"+productClassify.getClassifyId()); updates.add(productClassify); } + updateIds.add(productClassify.getClassifyId()); + + for (Map.Entry productClassifyLangInfoEntry : productClassify.getLangInfoMap().entrySet()) { + CereProductClassifyLangInfo productClassifyLangInfo = productClassifyLangInfoEntry.getValue(); + productClassifyLangInfo.setClassifyId(child.getClassifyId()); + productClassifyLangInfo.setId(null); + langInfoList.add(productClassifyLangInfo); + } + if(!EmptyUtils.isEmpty(child.getChilds())){ //新增子级类别 for (CereProductClassify classify1:child.getChilds()) { - addChildClaasify(productClassify,updates,time,classify1,IntegerEnum.CLASSIFY_LEVEL_THREE.getCode()); + addChildClaasify(productClassify,updates,updateIds, time,classify1,IntegerEnum.CLASSIFY_LEVEL_THREE.getCode(),langInfoList); } } } @@ -150,20 +182,29 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time=TimeUtils.yyMMddHHmmss(); //定义批量更新层级结构字段数组 List updates=new ArrayList<>(); - + List updateIds=new ArrayList<>(); + List langInfoList = new ArrayList<>(); if(!EmptyUtils.isEmpty(param.getClassifies())){ - System.out.println(JSON.toJSON(param.getClassifies())); for (CereProductClassify classify:param.getClassifies()) { - addOneClassify(classify,time,updates); + addOneClassify(classify,time,updates, updateIds, langInfoList); } - System.out.println(JSON.toJSON(param.getClassifies())); if(!EmptyUtils.isEmpty(updates)){ //批量更新分类层级结构 cereProductClassifyDAO.updateBatchLevelHierarchy(updates); } + if(!EmptyUtils.isEmpty(updateIds)){ + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, updateIds)); + } if(!EmptyUtils.isEmpty(param.getDeleteIds())){ //删除分类 cereProductClassifyDAO.deleteByIds(param.getDeleteIds()); + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, param.getDeleteIds())); + + } + if(CollectionUtils.isNotEmpty(langInfoList)) { + cereProductClassifyLangInfoService.saveBatch(langInfoList); } } //新增日志 @@ -173,22 +214,44 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic @Override public CereProductClassify getById(Long classifyId) throws CoBusinessException { //查询一级类别数据 + List classifyIdList = new ArrayList<>(); CereProductClassify classify=cereProductClassifyDAO.selectByPrimaryKey(classifyId); if(classify!=null){ + classifyIdList.add(classify.getClassifyId()); //查询所有二级分类 List classifies=cereProductClassifyDAO.findByPid(classify.getClassifyId()); if(!EmptyUtils.isEmpty(classifies)){ - //查询所有三级分类 - classifies.forEach(a -> { + classifyIdList.addAll(classifies.stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + for (CereProductClassify a : classifies) { + //查询所有三级分类 a.setChilds(cereProductClassifyDAO.findByPid(a.getClassifyId())); - }); - classifies.forEach(a -> { - a.initData(); - a.getChilds().forEach(CereProductClassify::initData); - }); + classifyIdList.addAll(a.getChilds().stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + } classify.setChilds(classifies); } } + + if(CollectionUtils.isNotEmpty(classifyIdList)) { + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId, classifyIdList)); + if (!EmptyUtils.isEmpty(classify)) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + if(CollectionUtils.isNotEmpty(classify.getChilds())) { + for (CereProductClassify secondClassify : classify.getChilds()) { + secondClassify.initMap(cereProductClassifyLangInfoList); + secondClassify.initData(); + if(CollectionUtils.isNotEmpty(secondClassify.getChilds())) { + for (CereProductClassify thirdClassify : classify.getChilds()) { + thirdClassify.initMap(cereProductClassifyLangInfoList); + thirdClassify.initData(); + } + } + } + } + } + } + return classify; } @@ -196,12 +259,21 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic public Page getAll(ClassifyGetAllParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); List list=cereProductClassifyDAO.getAll(); - list.forEach(a -> { - a.initData(); - if(a.getChilds() != null) { - a.getChilds().forEach(CereProductClassify::initData); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (CereProductClassify classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } } - }); + + } PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; @@ -218,9 +290,11 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time =TimeUtils.yyMMddHHmmss(); //查询一级类别层级 CereProductClassify classify=cereProductClassifyDAO.selectByPrimaryKey(param.getOneClassifyId()); + List deleteIdList = new ArrayList<>(); if(classify!=null){ //删除一级类别 cereProductClassifyDAO.deleteByPrimaryKey(param.getOneClassifyId()); + deleteIdList.add(param.getOneClassifyId()); String[] split = classify.getClassifyLevelHierarchy().split("/"); if(!EmptyUtils.isEmpty(split)){ if(split.length==3){ @@ -229,6 +303,7 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-1])); //删除二级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-1])); }else if(split.length==4){ @@ -238,6 +313,7 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-2])); //删除二级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-2])); //校验当前三级类别是否有绑定商品数据 @@ -245,11 +321,17 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-1])); //删除三级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-1])); } } } + if(CollectionUtils.isNotEmpty(deleteIdList)) { + deleteIdList = deleteIdList.stream().distinct().collect(Collectors.toList()); + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, deleteIdList)); + } //新增日志 cerePlatformLogService.addLog(user,"商品类别","平台端操作","删除商品类别",String.valueOf(param.getOneClassifyId()),time); } @@ -260,6 +342,26 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic List list=cereProductClassifyDAO.findAll(); //查询所有子节点类目 List childs=cereProductClassifyDAO.findChilds(); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(Classify::getId).collect(Collectors.toList())); + classifyIdList.addAll(childs.stream().map(Classify::getId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Classify classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + } + + for (Classify classify : childs) { + classify.initMap(cereProductClassifyLangInfoList); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((classify -> { diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductImageServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductImageServiceImpl.java index 2327ba5..3c6e9a2 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductImageServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereProductImageServiceImpl.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.service.product.impl; import com.shop.cereshop.admin.dao.product.CereProductImageDAO; import com.shop.cereshop.admin.service.product.CereProductImageService; -import com.shop.cereshop.commons.domain.product.CereProductImage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductLangInfoServiceImpl.java new file mode 100644 index 0000000..1f75b88 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereShopProductLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product.impl; + +import com.shop.cereshop.admin.dao.product.CereShopProductLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; +import com.shop.cereshop.admin.service.product.CereShopProductLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@Service +public class CereShopProductLangInfoServiceImpl extends ServiceImpl implements CereShopProductLangInfoService { +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereSkuNameLangInfoServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereSkuNameLangInfoServiceImpl.java new file mode 100644 index 0000000..d7d288b --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/product/impl/CereSkuNameLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.admin.service.product.impl; + +import com.shop.cereshop.admin.dao.product.CereSkuNameLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; +import com.shop.cereshop.admin.service.product.CereSkuNameLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@Service +public class CereSkuNameLangInfoServiceImpl extends ServiceImpl implements CereSkuNameLangInfoService { +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/sharesetting/CerePlatformShareSettingService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/sharesetting/CerePlatformShareSettingService.java index 4569529..f388f3f 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/sharesetting/CerePlatformShareSettingService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/sharesetting/CerePlatformShareSettingService.java @@ -6,19 +6,13 @@ package com.shop.cereshop.admin.service.sharesetting; import com.shop.cereshop.admin.page.sharesetting.PlatformShareSetting; -import com.shop.cereshop.admin.param.dict.*; import com.shop.cereshop.admin.param.sharesetting.ShareSettingDeleteParam; import com.shop.cereshop.admin.param.sharesetting.ShareSettingGetAllParam; import com.shop.cereshop.admin.param.sharesetting.ShareSettingSaveParam; import com.shop.cereshop.admin.param.sharesetting.ShareSettingUpdateParam; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.dict.CerePlatformDict; -import com.shop.cereshop.commons.domain.sharesettng.CerePlatformShareSetting; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; -import org.apache.poi.ss.usermodel.Workbook; - -import java.util.List; public interface CerePlatformShareSettingService { void save(ShareSettingSaveParam param, CerePlatformUser user) throws CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CerePlatformShopService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CerePlatformShopService.java index 059c656..b500ccf 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CerePlatformShopService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CerePlatformShopService.java @@ -5,15 +5,13 @@ */ package com.shop.cereshop.admin.service.shop; -import com.shop.cereshop.admin.page.shop.ShopGetAll; -import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.admin.page.finance.FinanceCount; import com.shop.cereshop.admin.page.shop.Shop; -import com.shop.cereshop.admin.param.finance.FinanceParam; +import com.shop.cereshop.admin.page.shop.ShopGetAll; import com.shop.cereshop.admin.param.shop.ShopGetAllParam; import com.shop.cereshop.admin.param.shop.ShopSaveParam; import com.shop.cereshop.admin.param.shop.ShopStartParam; import com.shop.cereshop.admin.param.shop.ShopUpdateParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.shop.CerePlatformShop; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCheckService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCheckService.java index d48b06d..327e6ed 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCheckService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCheckService.java @@ -6,11 +6,10 @@ package com.shop.cereshop.admin.service.shop; import com.shop.cereshop.admin.page.business.Business; -import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.admin.page.shop.Shop; import com.shop.cereshop.admin.param.shopcheck.CheckDeleteParam; import com.shop.cereshop.admin.param.shopcheck.CheckGetAllParam; import com.shop.cereshop.admin.param.shopcheck.CheckHandleParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCommentService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCommentService.java index baa4857..08df969 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCommentService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopCommentService.java @@ -5,11 +5,11 @@ */ package com.shop.cereshop.admin.service.shop; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.page.shop.CommentDetail; import com.shop.cereshop.admin.param.comment.CommentDeleteParam; import com.shop.cereshop.admin.param.comment.CommentGetAllParam; import com.shop.cereshop.admin.param.comment.CommentUpdateParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopWithdrawalService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopWithdrawalService.java index f458b8e..6b68a18 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopWithdrawalService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/CereShopWithdrawalService.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.service.shop; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.withdrawal.WithdrawalGetAllParam; import com.shop.cereshop.admin.param.withdrawal.WithdrawalHandleParam; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.shop.CereShopWithdrawal; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePriceProductServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePriceProductServiceImpl.java index 2f82fe0..25b371d 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePriceProductServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CerePriceProductServiceImpl.java @@ -7,7 +7,6 @@ package com.shop.cereshop.admin.service.shop.impl; import com.shop.cereshop.admin.dao.shop.CerePriceProductDAO; import com.shop.cereshop.admin.service.shop.CerePriceProductService; -import com.shop.cereshop.commons.domain.tool.CerePriceProduct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopWithdrawalServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopWithdrawalServiceImpl.java index 84cf709..7890678 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopWithdrawalServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/shop/impl/CereShopWithdrawalServiceImpl.java @@ -8,14 +8,14 @@ package com.shop.cereshop.admin.service.shop.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.admin.dao.shop.CereShopWithdrawalDAO; -import com.shop.cereshop.admin.pay.xs.XsPayService; -import com.shop.cereshop.admin.utils.EncodeUtil; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.param.withdrawal.WithdrawalGetAllParam; import com.shop.cereshop.admin.param.withdrawal.WithdrawalHandleParam; +import com.shop.cereshop.admin.pay.xs.XsPayService; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.admin.service.shop.CereShopWithdrawalService; +import com.shop.cereshop.admin.utils.EncodeUtil; import com.shop.cereshop.commons.constant.IntegerEnum; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.shop.CereShopWithdrawal; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserRoleService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserRoleService.java index e0d6c20..9ce230e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserRoleService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserRoleService.java @@ -6,7 +6,6 @@ package com.shop.cereshop.admin.service.user; import com.shop.cereshop.admin.page.role.PlatformUserRole; -import com.shop.cereshop.commons.domain.role.CerePlatformRole; import com.shop.cereshop.commons.domain.user.CerePlatformUserRole; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserService.java index b3c7f68..245d0da 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserService.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/CerePlatformUserService.java @@ -5,9 +5,9 @@ */ package com.shop.cereshop.admin.service.user; -import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.admin.page.user.PlatformUser; import com.shop.cereshop.admin.param.user.*; +import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/impl/CerePlatformUserRoleServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/impl/CerePlatformUserRoleServiceImpl.java index f9c5f11..7f6b9ca 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/impl/CerePlatformUserRoleServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/user/impl/CerePlatformUserRoleServiceImpl.java @@ -8,7 +8,6 @@ package com.shop.cereshop.admin.service.user.impl; import com.shop.cereshop.admin.dao.user.CerePlatformUserRoleDAO; import com.shop.cereshop.admin.page.role.PlatformUserRole; import com.shop.cereshop.admin.service.user.CerePlatformUserRoleService; -import com.shop.cereshop.commons.domain.role.CerePlatformRole; import com.shop.cereshop.commons.domain.user.CerePlatformUserRole; import com.shop.cereshop.commons.exception.CoBusinessException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/word/impl/CerePlatformWordServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/word/impl/CerePlatformWordServiceImpl.java index 6c4450a..87f8235 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/word/impl/CerePlatformWordServiceImpl.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/service/word/impl/CerePlatformWordServiceImpl.java @@ -12,7 +12,6 @@ import com.shop.cereshop.admin.param.word.WordParam; import com.shop.cereshop.admin.service.log.CerePlatformLogService; import com.shop.cereshop.admin.service.word.CerePlatformWordService; import com.shop.cereshop.commons.domain.common.Page; -import com.shop.cereshop.commons.domain.log.CerePlatformLog; import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.domain.word.CerePlatformWord; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/third/weixin/XMLParse.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/third/weixin/XMLParse.java index b416103..afe5386 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/third/weixin/XMLParse.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/third/weixin/XMLParse.java @@ -8,16 +8,15 @@ package com.shop.cereshop.admin.third.weixin; -import java.io.StringReader; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.StringReader; + /** * XMLParse class * diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/timing/LabelInitializationRunnable.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/timing/LabelInitializationRunnable.java index 09b3ff8..1c20962 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/timing/LabelInitializationRunnable.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/timing/LabelInitializationRunnable.java @@ -13,6 +13,7 @@ import com.shop.cereshop.commons.utils.EmptyUtils; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml new file mode 100644 index 0000000..5f58136 --- /dev/null +++ b/cereshop-admin/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, lang_key, lang_desc, lang_zh, lang_en + + + diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml index 688ac46..4380af2 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml @@ -5,7 +5,6 @@ - @@ -17,7 +16,7 @@ - permission_id, permission_pid, permission_name, permission_name_json, permission_uri, permission, icon, + permission_id, permission_pid, permission_name, permission_uri, permission, icon, `describe`, resource_type, sort, project, create_time, update_time - SELECT permission_id,permission_pid,permission_name, permission_name_json, permission_uri,permission,icon,`describe`,resource_type,sort FROM cere_platform_permission where permission_id=#{permissionId} + SELECT permission_id,permission_pid,permission_name, permission_uri,permission,icon,`describe`,resource_type,sort FROM cere_platform_permission where permission_id=#{permissionId} @@ -237,7 +226,7 @@ - insert into cere_platform_permission (permission_id,permission_pid, permission_name, permission_name_json, permission_uri, + insert into cere_platform_permission (permission_id,permission_pid, permission_name, permission_uri, permission, icon, `describe`, resource_type, sort, project, create_time @@ -247,7 +236,6 @@ #{item.permissionId}, #{item.permissionPid}, #{item.permissionName}, - #{item.permissionNameJson}, #{item.permissionUri}, #{item.permission}, #{item.icon}, diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml new file mode 100644 index 0000000..513a195 --- /dev/null +++ b/cereshop-admin/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, permission_id, permission_name, language_type + + + diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml index 7b03c36..d28b11b 100644 --- a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml +++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml @@ -8,7 +8,6 @@ - @@ -18,7 +17,7 @@ classify_id, classify_pid, classify_hierarchy, classify_level, classify_level_hierarchy, - classify_name, classify_name_json, classify_image, sort, link, project, create_time, update_time + classify_name, classify_image, sort, link, project, create_time, update_time - SELECT classify_id,classify_name,classify_name_json,classify_level_hierarchy,classify_image,link,project,classify_level FROM cere_product_classify + SELECT classify_id,classify_name,classify_level_hierarchy,classify_image,link,project,classify_level FROM cere_product_classify where classify_id=#{classifyId} @@ -209,12 +198,12 @@ diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml new file mode 100644 index 0000000..1b7cb94 --- /dev/null +++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, classify_id, classify_name, language_type + + + diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml new file mode 100644 index 0000000..e742876 --- /dev/null +++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + id, product_id, product_name, product_brief, product_text, language_type + + + diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml new file mode 100644 index 0000000..7170b1d --- /dev/null +++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, sku_uni_id, sku_name, sku_value, language_type + + + diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/lang/CerePlatformLangInfoController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/lang/CerePlatformLangInfoController.java new file mode 100644 index 0000000..9e31bb0 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/lang/CerePlatformLangInfoController.java @@ -0,0 +1,48 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.controller.lang; + +import com.shop.cereshop.app.service.lang.CerePlatformLangInfoService; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.result.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformLangInfo") +@Api(value = "CerePlatformLangInfo", tags = "") +public class CerePlatformLangInfoController { + @Autowired + private CerePlatformLangInfoService cerePlatformLangInfoService; + + /** + * 多语言查询 + * @return + */ + @PostMapping(value = "getAllForMap") + @ApiOperation(value = "多语言查询") + public Result>> getAllForMap() throws CoBusinessException { + return new Result(cerePlatformLangInfoService.getAllForMap()); + } +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/permission/CerePlatformPermissionLangInfoController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/permission/CerePlatformPermissionLangInfoController.java new file mode 100644 index 0000000..4e932be --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/permission/CerePlatformPermissionLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.controller.permission; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformPermissionLangInfo") +@Api(value = "CerePlatformPermissionLangInfo", tags = "") +public class CerePlatformPermissionLangInfoController { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereProductClassifyLangInfoController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereProductClassifyLangInfoController.java new file mode 100644 index 0000000..31ee732 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereProductClassifyLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cereProductClassifyLangInfo") +@Api(value = "CereProductClassifyLangInfo", tags = "") +public class CereProductClassifyLangInfoController { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereShopProductLangInfoController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereShopProductLangInfoController.java new file mode 100644 index 0000000..322d8e4 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereShopProductLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@RestController +@RequestMapping("/cereShopProductLangInfo") +@Api(value = "CereShopProductLangInfo", tags = "店铺商品信息表") +public class CereShopProductLangInfoController { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereSkuNameLangInfoController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereSkuNameLangInfoController.java new file mode 100644 index 0000000..19825ad --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/product/CereSkuNameLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@RestController +@RequestMapping("/cereSkuNameLangInfo") +@Api(value = "CereSkuNameLangInfo", tags = "商品规格属性信息表") +public class CereSkuNameLangInfoController { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/lang/CerePlatformLangInfoDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/lang/CerePlatformLangInfoDAO.java new file mode 100644 index 0000000..d333caa --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/lang/CerePlatformLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.dao.lang; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/permission/CerePlatformPermissionLangInfoDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/permission/CerePlatformPermissionLangInfoDAO.java new file mode 100644 index 0000000..f24f42e --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/permission/CerePlatformPermissionLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.dao.permission; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformPermissionLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereProductClassifyLangInfoDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereProductClassifyLangInfoDAO.java new file mode 100644 index 0000000..36eb389 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereProductClassifyLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereProductClassifyLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductLangInfoDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductLangInfoDAO.java new file mode 100644 index 0000000..42ba923 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereShopProductLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameDAO.java index d595282..322b8f7 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameDAO.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameDAO.java @@ -5,18 +5,19 @@ */ package com.shop.cereshop.app.dao.product; -import com.shop.cereshop.commons.domain.product.CereProductSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereProductSku; +import com.shop.cereshop.commons.domain.product.CereSkuName; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper -public interface CereSkuNameDAO extends BaseMapper { +public interface CereSkuNameDAO extends BaseMapper { int deleteByPrimaryKey(@Param("skuId") Long skuId); - int insertSelective(CereProductSku record); + int insertSelective(CereSkuName record); - int updateByPrimaryKeySelective(CereProductSku record); + int updateByPrimaryKeySelective(CereSkuName record); - int updateByPrimaryKey(CereProductSku record); + int updateByPrimaryKey(CereSkuName record); } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameLangInfoDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameLangInfoDAO.java new file mode 100644 index 0000000..62df4cd --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereSkuNameLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereSkuNameLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/interceptor/AuthorizationInterceptor.java b/cereshop-app/src/main/java/com/shop/cereshop/app/interceptor/AuthorizationInterceptor.java index 6870236..4594e21 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/interceptor/AuthorizationInterceptor.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/interceptor/AuthorizationInterceptor.java @@ -157,6 +157,12 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { ContextUtil.clearProject(); } + + String language = request.getHeader("language"); + if(StringUtils.isEmpty(language)){ + language = "zh"; + } + ContextUtil.setLanguage(language); return true; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/page/classify/Classify.java b/cereshop-app/src/main/java/com/shop/cereshop/app/page/classify/Classify.java index 60652cd..1a32ee6 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/page/classify/Classify.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/page/classify/Classify.java @@ -5,11 +5,20 @@ */ package com.shop.cereshop.app.page.classify; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 店铺所有商品所属一级类目 @@ -48,4 +57,52 @@ public class Classify { */ @ApiModelProperty(value = "子节点") private List childs; + + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setClassifyName(langInfoMap.get(defaultLangType).getClassifyName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setClassifyName(langInfoMap.get(LangUtil.ZH).getClassifyName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setClassifyName(langInfoMap.get(LangUtil.EN).getClassifyName()); + } else { + setClassifyName(langInfoMap.entrySet().stream().findFirst().get().getValue().getClassifyName()); + } + }else if(StringUtils.isNotEmpty(getClassifyName())){ + langInfoMap = new HashMap<>(); + CereProductClassifyLangInfo classifyLangInfo = new CereProductClassifyLangInfo(); + classifyLangInfo.setClassifyId(getClassifyId()); + classifyLangInfo.setClassifyName(getClassifyName()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getClassifyId(), getClassifyId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereProductClassifyLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/page/product/ProductDetail.java b/cereshop-app/src/main/java/com/shop/cereshop/app/page/product/ProductDetail.java index 563ab4f..e922ac2 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/page/product/ProductDetail.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/page/product/ProductDetail.java @@ -5,18 +5,26 @@ */ package com.shop.cereshop.app.page.product; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.shop.cereshop.commons.domain.collage.CollageOrder; import com.shop.cereshop.app.page.index.Product; import com.shop.cereshop.commons.domain.buyer.CereBuyerReceive; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; import com.shop.cereshop.commons.domain.product.Sku; import com.shop.cereshop.commons.domain.product.SkuName; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 商品返回数据 @@ -378,4 +386,62 @@ public class ProductDetail { */ @ApiModelProperty(value = "限购数量") private Integer limitNumber; + + + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setProductName(langInfoMap.get(defaultLangType).getProductName()); + setProductBrief(langInfoMap.get(defaultLangType).getProductBrief()); + setText(langInfoMap.get(defaultLangType).getProductText()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setProductName(langInfoMap.get(LangUtil.ZH).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.ZH).getProductBrief()); + setText(langInfoMap.get(LangUtil.ZH).getProductText()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setProductName(langInfoMap.get(LangUtil.EN).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.EN).getProductBrief()); + setText(langInfoMap.get(LangUtil.EN).getProductText()); + } else { + setProductName(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductName()); + setProductBrief(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductBrief()); + setText(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductText()); + } + }else if(StringUtils.isNotEmpty(productName)){ + langInfoMap = new HashMap<>(); + CereShopProductLangInfo classifyLangInfo = new CereShopProductLangInfo(); + classifyLangInfo.setProductId(getProductId()); + classifyLangInfo.setProductBrief(getProductBrief()); + classifyLangInfo.setProductName(getProductName()); + classifyLangInfo.setProductText(getText()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getProductId(), getProductId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereShopProductLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/CerePlatformLangInfoService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/CerePlatformLangInfoService.java new file mode 100644 index 0000000..b55d5ad --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/CerePlatformLangInfoService.java @@ -0,0 +1,24 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.lang; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +import java.util.Map; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformLangInfoService extends IService { + Map> getAllForMap(); +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/impl/CerePlatformLangInfoServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/impl/CerePlatformLangInfoServiceImpl.java new file mode 100644 index 0000000..6606eec --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/lang/impl/CerePlatformLangInfoServiceImpl.java @@ -0,0 +1,51 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.lang.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.shop.cereshop.app.dao.lang.CerePlatformLangInfoDAO; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; +import com.shop.cereshop.app.service.lang.CerePlatformLangInfoService; + +import com.shop.cereshop.commons.utils.LangUtil; +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformLangInfoServiceImpl extends ServiceImpl implements CerePlatformLangInfoService { + + @Override + public Map> getAllForMap() { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + List brandList = baseMapper.selectList(lqw); + Map> result = new HashMap<>(); + Map enMap = new HashMap<>(); + Map zhMap = new HashMap<>(); + for (CerePlatformLangInfo cerePlatformLangInfo : brandList) { + enMap.put(cerePlatformLangInfo.getLangKey(), cerePlatformLangInfo.getLangEn()); + zhMap.put(cerePlatformLangInfo.getLangKey(), cerePlatformLangInfo.getLangZh()); + } + result.put(LangUtil.ZH, zhMap); + result.put(LangUtil.EN, enMap); + return result; + } +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/CerePlatformPermissionLangInfoService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/CerePlatformPermissionLangInfoService.java new file mode 100644 index 0000000..453098d --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/CerePlatformPermissionLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.permission; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformPermissionLangInfoService extends IService { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java new file mode 100644 index 0000000..14a034d --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.permission.impl; + +import com.shop.cereshop.app.dao.permission.CerePlatformPermissionLangInfoDAO; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.app.service.permission.CerePlatformPermissionLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformPermissionLangInfoServiceImpl extends ServiceImpl implements CerePlatformPermissionLangInfoService { +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereProductClassifyLangInfoService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereProductClassifyLangInfoService.java new file mode 100644 index 0000000..671aa99 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereProductClassifyLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CereProductClassifyLangInfoService extends IService { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereShopProductLangInfoService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereShopProductLangInfoService.java new file mode 100644 index 0000000..2a509a4 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereShopProductLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +/** + *

+ * 业务接口 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +public interface CereShopProductLangInfoService extends IService { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameLangInfoService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameLangInfoService.java new file mode 100644 index 0000000..54dd1ca --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +/** + *

+ * 业务接口 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +public interface CereSkuNameLangInfoService extends IService { + +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameService.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameService.java index 0672f00..3c1d846 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameService.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/CereSkuNameService.java @@ -5,6 +5,9 @@ */ package com.shop.cereshop.app.service.product; -public interface CereSkuNameService { +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereSkuName; + +public interface CereSkuNameService extends IService { } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyLangInfoServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyLangInfoServiceImpl.java new file mode 100644 index 0000000..b7a3be1 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product.impl; + +import com.shop.cereshop.app.dao.product.CereProductClassifyLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; +import com.shop.cereshop.app.service.product.CereProductClassifyLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CereProductClassifyLangInfoServiceImpl extends ServiceImpl implements CereProductClassifyLangInfoService { +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyServiceImpl.java index 6a30c55..7ff4c10 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereProductClassifyServiceImpl.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.app.service.product.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.shop.cereshop.app.dao.product.CereProductClassifyDAO; @@ -15,6 +17,7 @@ import com.shop.cereshop.app.page.index.ProductImage; import com.shop.cereshop.app.page.shop.Shop; import com.shop.cereshop.app.param.classify.ClassifyParam; import com.shop.cereshop.app.param.classify.ClassifyProductParam; +import com.shop.cereshop.app.service.product.CereProductClassifyLangInfoService; import com.shop.cereshop.app.service.product.CereProductClassifyService; import com.shop.cereshop.app.service.product.CereShopProductService; import com.shop.cereshop.app.service.shop.CerePlatformShopService; @@ -23,6 +26,7 @@ import com.shop.cereshop.commons.cache.product.ProductBo; import com.shop.cereshop.commons.domain.buyer.CereBuyerUser; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.product.CereProductClassify; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +35,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service public class CereProductClassifyServiceImpl implements CereProductClassifyService { @@ -47,6 +52,9 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic @Autowired private CereShopProductService cereShopProductService; + @Autowired + private CereProductClassifyLangInfoService cereProductClassifyLangInfoService; + @Override public List findAll() { return cereProductClassifyDAO.findAll(ContextUtil.getProject()); @@ -55,6 +63,7 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic @Override public List getFirstClassify(ClassifyParam param) throws CoBusinessException { List classifies=null; + List classifyIdList = new ArrayList<>(); if(EmptyUtils.isEmpty(param.getClassifyId())){ //查询所有一级类目 classifies = cereProductClassifyDAO.getFirstClassify(ContextUtil.getProject(), null); @@ -78,6 +87,45 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic }); } } + + if(CollectionUtils.isNotEmpty(classifies)) { + classifyIdList.addAll(classifies.stream().map(Classify::getClassifyId).collect(Collectors.toList())); + for (Classify classify : classifies) { + if (CollectionUtils.isNotEmpty(classify.getChilds())) { + classifyIdList.addAll(classify.getChilds().stream().map(Classify::getClassifyId).collect(Collectors.toList())); + for (Classify classifyChild : classify.getChilds()) { + if (CollectionUtils.isNotEmpty(classifyChild.getChilds())) { + classifyIdList.addAll(classifyChild.getChilds().stream().map(Classify::getClassifyId).collect(Collectors.toList())); + } + } + } + } + } + + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(CollectionUtils.isNotEmpty(classifies)){ + for (Classify classify : classifies) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(ContextUtil.getLanguage()); + if(CollectionUtils.isNotEmpty(classify.getChilds())) { + for (Classify classifyChild : classify.getChilds()) { + classifyChild.initMap(cereProductClassifyLangInfoList); + classifyChild.initData(ContextUtil.getLanguage()); + if(CollectionUtils.isNotEmpty(classifyChild.getChilds())) { + for (Classify classifyThirdChild : classifyChild.getChilds()) { + classifyThirdChild.initMap(cereProductClassifyLangInfoList); + classifyThirdChild.initData(ContextUtil.getLanguage()); + } + } + } + } + } + } + + } return classifies; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductLangInfoServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductLangInfoServiceImpl.java new file mode 100644 index 0000000..5d3788e --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product.impl; + +import com.shop.cereshop.app.dao.product.CereShopProductLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; +import com.shop.cereshop.app.service.product.CereShopProductLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@Service +public class CereShopProductLangInfoServiceImpl extends ServiceImpl implements CereShopProductLangInfoService { +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java index 793e6bb..6fc3596 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java @@ -7,6 +7,8 @@ package com.shop.cereshop.app.service.product.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.luciad.imageio.webp.WebPReadParam; @@ -14,6 +16,7 @@ import com.shop.cereshop.app.dao.platformtool.CerePlatformDiscountDAO; import com.shop.cereshop.app.dao.platformtool.CerePlatformSeckillDAO; import com.shop.cereshop.app.dao.product.CereProductStatsByDayDAO; import com.shop.cereshop.app.dao.product.CereShopProductDAO; +import com.shop.cereshop.app.dao.product.CereShopProductLangInfoDAO; import com.shop.cereshop.app.dao.product.CereSkuRealInfoDAO; import com.shop.cereshop.app.page.canvas.CanvasProduct; import com.shop.cereshop.app.page.canvas.CanvasProductNumber; @@ -48,10 +51,7 @@ import com.shop.cereshop.app.service.order.CereShopOrderService; import com.shop.cereshop.app.service.platformtool.CerePlatformDiscountService; import com.shop.cereshop.app.service.platformtool.CerePlatformSeckillService; import com.shop.cereshop.app.service.price.CereShopPriceService; -import com.shop.cereshop.app.service.product.CereCommentWordService; -import com.shop.cereshop.app.service.product.CereProductMemberService; -import com.shop.cereshop.app.service.product.CereProductSkuService; -import com.shop.cereshop.app.service.product.CereShopProductService; +import com.shop.cereshop.app.service.product.*; import com.shop.cereshop.app.service.scene.CereShopSceneService; import com.shop.cereshop.app.service.seckill.CereShopSeckillDetailService; import com.shop.cereshop.app.service.seckill.CereShopSeckillService; @@ -62,6 +62,7 @@ import com.shop.cereshop.app.service.shop.CereShopVisitService; import com.shop.cereshop.app.service.stock.CereStockService; import com.shop.cereshop.app.service.storehouse.CereShopStorehouseService; import com.shop.cereshop.app.utils.AlipayUtil; +import com.shop.cereshop.app.utils.ContextUtil; import com.shop.cereshop.app.utils.WechatUtil; import com.shop.cereshop.commons.cache.constants.CacheKeyConstants; import com.shop.cereshop.commons.cache.product.ProductBo; @@ -225,6 +226,18 @@ public class CereShopProductServiceImpl implements CereShopProductService { @Autowired private CereShopStorehouseService cereShopStorehouseService; + @Autowired + private CereShopProductLangInfoService shopProductLangInfoService; + + @Autowired + private CereShopProductLangInfoDAO shopProductLangInfoDAO; + + @Autowired + private CereSkuNameLangInfoService cereSkuNameLangInfoService; + + @Autowired + private CereSkuNameService cereSkuNameService; + /** * 商品详情前缀 */ @@ -332,30 +345,69 @@ public class CereShopProductServiceImpl implements CereShopProductService { } } - //查询该商品所有规格名 - List names=cereProductSkuService.findSkuNames(param.getProductId()); - if(!EmptyUtils.isEmpty(names)){ - //查询该商品所有规格值数据 - List list=cereProductSkuService.findValuesByProductId(param.getProductId()); - if(!EmptyUtils.isEmpty(list)){ - names.forEach(name -> { - if(!EmptyUtils.isEmpty(name.getNameCode())){ - List values=new ArrayList<>(); - for (int i = 0; i < list.size(); i++) { - if(i<0){ - i=0; - } - if(list.get(i).getSkuName().equals(name.getSkuName())){ - values.add(list.get(i)); - list.remove(i); - i--; - } - } - name.setValues(values); - } - }); + //SKU详细数据 + List skuIdList = detail.getMap().values().stream().map(Sku::getSkuId).distinct().collect(Collectors.toList()); + List cereSkuNameList = cereSkuNameService.list(Wrappers.lambdaQuery().in(CereSkuName::getSkuId, skuIdList)); + + + //SKU的多语言名称 + List cereSkuNameLangKeyList = cereSkuNameList.stream().map(CereSkuName::getUniId).collect(Collectors.toList()); + List cereSkuNameLangInfoList = cereSkuNameLangInfoService.list(Wrappers.lambdaQuery().in(CereSkuNameLangInfo::getSkuUniId, cereSkuNameLangKeyList)); + + Map> cereSkuNameListMap = cereSkuNameList.stream().collect(Collectors.groupingBy(CereSkuName::getNameCode, LinkedHashMap::new, Collectors.toList())); + + for (CereSkuName cereSkuName : cereSkuNameList) { + cereSkuName.initMap(cereSkuNameLangInfoList); + cereSkuName.initData(ContextUtil.getLanguage()); + } + + + List names = new ArrayList<>(); + for (List skuNameList : cereSkuNameListMap.values()) { + CereSkuName firstSkuName = skuNameList.get(0); + SkuName skuNameParam = new SkuName(); + skuNameParam.setSkuId(firstSkuName.getSkuId()); + skuNameParam.setNameCode(firstSkuName.getNameCode()); + skuNameParam.setSkuName(firstSkuName.getSkuName()); + skuNameParam.setLangInfoMap(firstSkuName.getLangInfoMap()); + List values=new ArrayList<>(); + for (List cereSkuNameValueList : skuNameList.stream().collect(Collectors.groupingBy(CereSkuName::getValueCode, LinkedHashMap::new, Collectors.toList())).values()) { + CereSkuName cereSkuName = cereSkuNameValueList.get(0); + SkuValue skuValueParam=new SkuValue(); + skuValueParam.setValueCode(cereSkuName.getValueCode()); + skuValueParam.setSkuValue(cereSkuName.getSkuValue()); + skuValueParam.setSkuName(skuNameParam.getSkuName()); + skuValueParam.setLangInfoMap(cereSkuName.getLangInfoMap()); + values.add(skuValueParam); } + skuNameParam.setValues(values); + names.add(skuNameParam); } + + //查询该商品所有规格名 +// List names=cereProductSkuService.findSkuNames(param.getProductId()); +// if(!EmptyUtils.isEmpty(names)){ +// //查询该商品所有规格值数据 +// List list=cereProductSkuService.findValuesByProductId(param.getProductId()); +// if(!EmptyUtils.isEmpty(list)){ +// names.forEach(name -> { +// if(!EmptyUtils.isEmpty(name.getNameCode())){ +// List values=new ArrayList<>(); +// for (int i = 0; i < list.size(); i++) { +// if(i<0){ +// i=0; +// } +// if(list.get(i).getSkuName().equals(name.getSkuName())){ +// values.add(list.get(i)); +// list.remove(i); +// i--; +// } +// } +// name.setValues(values); +// } +// }); +// } +// } detail.setNames(names); //查询商品评论信息 @@ -441,6 +493,19 @@ public class CereShopProductServiceImpl implements CereShopProductService { } } } + + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll( Collections.singletonList(detail.getProductId())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(ObjectUtils.isNotNull(detail)){ + detail.initMap(cereProductClassifyLangInfoList); + detail.initData(); + } + } } //更新日度统计 CereProductStatsByDay stats = new CereProductStatsByDay(); diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameLangInfoServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameLangInfoServiceImpl.java new file mode 100644 index 0000000..79cb6c9 --- /dev/null +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.app.service.product.impl; + +import com.shop.cereshop.app.dao.product.CereSkuNameLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; +import com.shop.cereshop.app.service.product.CereSkuNameLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@Service +public class CereSkuNameLangInfoServiceImpl extends ServiceImpl implements CereSkuNameLangInfoService { +} diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameServiceImpl.java index 25cd5a4..381a222 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereSkuNameServiceImpl.java @@ -5,9 +5,12 @@ */ package com.shop.cereshop.app.service.product.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.shop.cereshop.app.dao.product.CereSkuNameDAO; import com.shop.cereshop.app.service.product.CereSkuNameService; +import com.shop.cereshop.commons.domain.product.CereSkuName; import org.springframework.stereotype.Service; @Service -public class CereSkuNameServiceImpl implements CereSkuNameService { +public class CereSkuNameServiceImpl extends ServiceImpl implements CereSkuNameService { } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/utils/ContextUtil.java b/cereshop-app/src/main/java/com/shop/cereshop/app/utils/ContextUtil.java index fb4590b..e78ede5 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/utils/ContextUtil.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/utils/ContextUtil.java @@ -31,4 +31,24 @@ public class ContextUtil { return project; } } + + + static ThreadLocal languageTL = new ThreadLocal<>(); + + public static void setLanguage(String language){ + languageTL.set(language); + } + + public static void clearLanguage(){ + languageTL.set(null); + } + + public static String getLanguage(){ + String language = languageTL.get(); + if(StringUtils.isEmpty(language)) { + return "zh"; + }else { + return language; + } + } } diff --git a/cereshop-app/src/main/resources/application-security.yml b/cereshop-app/src/main/resources/application-security.yml index 0b25628..ba23a70 100644 --- a/cereshop-app/src/main/resources/application-security.yml +++ b/cereshop-app/src/main/resources/application-security.yml @@ -58,3 +58,4 @@ security: - /product/getSpecificSku - /product/getBroadCastList - /coupon/getChannelActivityCoupon + - /cerePlatformLangInfo/** diff --git a/cereshop-app/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml new file mode 100644 index 0000000..22a85c2 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, lang_key, lang_desc, lang_zh, lang_en + + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml new file mode 100644 index 0000000..2855bc8 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionLangInfoDAO.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, permission_id, permission_name, language_type + + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml new file mode 100644 index 0000000..70ec1a5 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, classify_id, classify_name, language_type + + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml new file mode 100644 index 0000000..d2f5d79 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + id, product_id, product_name, product_brief, product_text, language_type + + + diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml new file mode 100644 index 0000000..55a4934 --- /dev/null +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, sku_uni_id, sku_name, sku_value, language_type + + + diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/lang/CerePlatformLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/lang/CerePlatformLangInfoController.java new file mode 100644 index 0000000..a8404a2 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/lang/CerePlatformLangInfoController.java @@ -0,0 +1,49 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.lang; + +import com.shop.cereshop.business.service.lang.CerePlatformLangInfoService; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.result.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformLangInfo") +@Api(value = "CerePlatformLangInfo", tags = "") +public class CerePlatformLangInfoController { + + @Autowired + private CerePlatformLangInfoService cerePlatformLangInfoService; + + /** + * 多语言查询 + * @return + */ + @PostMapping(value = "getAllForMap") + @ApiOperation(value = "多语言查询") + public Result>> getAllForMap() throws CoBusinessException { + return new Result(cerePlatformLangInfoService.getAllForMap()); + } +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/permission/CerePlatformPermissionLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/permission/CerePlatformPermissionLangInfoController.java new file mode 100644 index 0000000..87c777d --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/permission/CerePlatformPermissionLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.permission; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cerePlatformPermissionLangInfo") +@Api(value = "CerePlatformPermissionLangInfo", tags = "") +public class CerePlatformPermissionLangInfoController { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereProductClassifyLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereProductClassifyLangInfoController.java new file mode 100644 index 0000000..5e55d85 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereProductClassifyLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@RestController +@RequestMapping("/cereProductClassifyLangInfo") +@Api(value = "CereProductClassifyLangInfo", tags = "") +public class CereProductClassifyLangInfoController { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereShopProductLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereShopProductLangInfoController.java new file mode 100644 index 0000000..609a6ec --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereShopProductLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@RestController +@RequestMapping("/cereShopProductLangInfo") +@Api(value = "CereShopProductLangInfo", tags = "店铺商品信息表") +public class CereShopProductLangInfoController { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereSkuNameLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereSkuNameLangInfoController.java new file mode 100644 index 0000000..03d681b --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/CereSkuNameLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@RestController +@RequestMapping("/cereSkuNameLangInfo") +@Api(value = "CereSkuNameLangInfo", tags = "商品规格属性信息表") +public class CereSkuNameLangInfoController { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/ProductClassifyLangInfoController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/ProductClassifyLangInfoController.java new file mode 100644 index 0000000..0935698 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/product/ProductClassifyLangInfoController.java @@ -0,0 +1,29 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.controller.product; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + *

+ * 前端控制器 + * + *

+ * + * @author + * @date 2023-12-23 + */ +@Slf4j +@RestController +@RequestMapping("/productClassifyLangInfo") +@Api(value = "ProductClassifyLangInfo", tags = "") +public class ProductClassifyLangInfoController { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/lang/CerePlatformLangInfoDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/lang/CerePlatformLangInfoDAO.java new file mode 100644 index 0000000..004ab5c --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/lang/CerePlatformLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.dao.lang; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/permission/CerePlatformPermissionLangInfoDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/permission/CerePlatformPermissionLangInfoDAO.java new file mode 100644 index 0000000..8b658ca --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/permission/CerePlatformPermissionLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.dao.permission; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CerePlatformPermissionLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereProductClassifyLangInfoDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereProductClassifyLangInfoDAO.java new file mode 100644 index 0000000..609fa4a --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereProductClassifyLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereProductClassifyLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereShopProductLangInfoDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereShopProductLangInfoDAO.java new file mode 100644 index 0000000..1fb0d53 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereShopProductLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereShopProductLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereSkuNameLangInfoDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereSkuNameLangInfoDAO.java new file mode 100644 index 0000000..48eec8d --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/product/CereSkuNameLangInfoDAO.java @@ -0,0 +1,16 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.dao.product; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CereSkuNameLangInfoDAO extends BaseMapper { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/canvas/CanvasProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/canvas/CanvasProduct.java index 832b731..05b7eae 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/canvas/CanvasProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/canvas/CanvasProduct.java @@ -5,11 +5,21 @@ */ package com.shop.cereshop.business.page.canvas; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 画布商品数据 @@ -95,4 +105,50 @@ public class CanvasProduct { */ @ApiModelProperty(value = "定价规则内容") private String rules; + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setProductName(langInfoMap.get(defaultLangType).getProductName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setProductName(langInfoMap.get(LangUtil.ZH).getProductName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setProductName(langInfoMap.get(LangUtil.EN).getProductName()); + } else { + setProductName(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductName()); + } + }else if(StringUtils.isNotEmpty(productName)){ + langInfoMap = new HashMap<>(); + CereShopProductLangInfo classifyLangInfo = new CereShopProductLangInfo(); + classifyLangInfo.setProductId(getProductId()); + classifyLangInfo.setProductName(getProductName()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getProductId(), getProductId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereShopProductLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/MenuButton.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/MenuButton.java index 1103029..a5346d1 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/MenuButton.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/MenuButton.java @@ -8,6 +8,8 @@ package com.shop.cereshop.business.page.permission; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.google.gson.Gson; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -79,34 +81,27 @@ public class MenuButton { private List buttons; /** - * 名称Json - */ - @ApiModelProperty(value = "名称Json") - private String permissionNameJson; - - /** * 名称Map */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map permissionNameMap; + private Map langInfoMap; + public void initData(){ - if(permissionNameMap == null){ - permissionNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(permissionNameMap)) { - if(StringUtils.isNotEmpty(permissionNameJson)){ - permissionNameMap = new Gson().fromJson(permissionNameJson, Map.class); - } - if(CollectionUtils.isEmpty(permissionNameMap)){ - permissionNameMap.put("zh", permissionName); + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setPermissionName(langInfoMap.get(defaultLangType).getPermissionName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setPermissionName(langInfoMap.get(LangUtil.ZH).getPermissionName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setPermissionName(langInfoMap.get(LangUtil.EN).getPermissionName()); + } else { + setPermissionName(langInfoMap.entrySet().stream().findFirst().get().getValue().getPermissionName()); } } - if(permissionNameMap.containsKey("zh")){ - permissionName = permissionNameMap.get("zh"); - }else if(permissionNameMap.containsKey("en")){ - permissionName = permissionNameMap.get("en"); - } } } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/Permission.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/Permission.java index 07ae016..7895786 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/Permission.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/permission/Permission.java @@ -8,6 +8,8 @@ package com.shop.cereshop.business.page.permission; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.google.gson.Gson; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -97,34 +99,27 @@ public class Permission { private List buttonPermissions; /** - * 名称Json - */ - @ApiModelProperty(value = "名称Json") - private String permissionNameJson; - - /** * 名称Map */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map permissionNameMap; + private Map langInfoMap; + public void initData(){ - if(permissionNameMap == null){ - permissionNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(permissionNameMap)) { - if(StringUtils.isNotEmpty(permissionNameJson)){ - permissionNameMap = new Gson().fromJson(permissionNameJson, Map.class); - } - if(CollectionUtils.isEmpty(permissionNameMap)){ - permissionNameMap.put("zh", permissionName); + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setPermissionName(langInfoMap.get(defaultLangType).getPermissionName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setPermissionName(langInfoMap.get(LangUtil.ZH).getPermissionName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setPermissionName(langInfoMap.get(LangUtil.EN).getPermissionName()); + } else { + setPermissionName(langInfoMap.entrySet().stream().findFirst().get().getValue().getPermissionName()); } } - if(permissionNameMap.containsKey("zh")){ - permissionName = permissionNameMap.get("zh"); - }else if(permissionNameMap.containsKey("en")){ - permissionName = permissionNameMap.get("en"); - } } } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java index e54b665..bd7252e 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/product/ShopProduct.java @@ -5,14 +5,23 @@ */ package com.shop.cereshop.business.page.product; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.shop.cereshop.business.param.product.SkuNameParam; import com.shop.cereshop.commons.domain.image.Image; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 商品返回数据实体类 @@ -215,4 +224,61 @@ public class ShopProduct { @ApiModelProperty("品牌id") private Long brandId; + + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setProductName(langInfoMap.get(defaultLangType).getProductName()); + setProductBrief(langInfoMap.get(defaultLangType).getProductBrief()); + setProductText(langInfoMap.get(defaultLangType).getProductText()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setProductName(langInfoMap.get(LangUtil.ZH).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.ZH).getProductBrief()); + setProductText(langInfoMap.get(LangUtil.ZH).getProductText()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setProductName(langInfoMap.get(LangUtil.EN).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.EN).getProductBrief()); + setProductText(langInfoMap.get(LangUtil.EN).getProductText()); + } else { + setProductName(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductName()); + setProductBrief(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductBrief()); + setProductText(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductText()); + } + }else if(StringUtils.isNotEmpty(productName)){ + langInfoMap = new HashMap<>(); + CereShopProductLangInfo classifyLangInfo = new CereShopProductLangInfo(); + classifyLangInfo.setProductId(getProductId()); + classifyLangInfo.setProductBrief(getProductBrief()); + classifyLangInfo.setProductName(getProductName()); + classifyLangInfo.setProductText(getProductText()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getProductId(), getProductId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereShopProductLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionSaveParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionSaveParam.java index 74245cb..15036af 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionSaveParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionSaveParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.business.param.permission; +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -85,5 +87,6 @@ public class PermissionSaveParam { * 名称Map */ @ApiModelProperty(value = "名称Map") - private Map permissionNameMap; + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionUpdateParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionUpdateParam.java index 8e8d97c..d79f0f5 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionUpdateParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/permission/PermissionUpdateParam.java @@ -5,6 +5,8 @@ */ package com.shop.cereshop.business.param.permission; +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -82,5 +84,6 @@ public class PermissionUpdateParam { * 名称Map */ @ApiModelProperty(value = "名称Map") - private Map permissionNameMap; + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductSaveParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductSaveParam.java index 4c7678d..7179100 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductSaveParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductSaveParam.java @@ -5,7 +5,10 @@ */ package com.shop.cereshop.business.param.product; +import com.baomidou.mybatisplus.annotation.TableField; import com.shop.cereshop.commons.domain.image.Image; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; import com.shop.cereshop.commons.utils.EmptyUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,6 +19,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 添加商品请求 @@ -159,4 +163,11 @@ public class ProductSaveParam { @ApiModelProperty("品牌id") private Long brandId; + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductUpdateParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductUpdateParam.java index 8cb2c5f..e69f0ef 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductUpdateParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/ProductUpdateParam.java @@ -5,13 +5,16 @@ */ package com.shop.cereshop.business.param.product; +import com.baomidou.mybatisplus.annotation.TableField; import com.shop.cereshop.commons.domain.image.Image; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.util.List; +import java.util.Map; /** * 更新商品请求 @@ -143,4 +146,11 @@ public class ProductUpdateParam { @ApiModelProperty("品牌id") private Long brandId; + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuNameParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuNameParam.java index a11a10e..b02d7fe 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuNameParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuNameParam.java @@ -5,15 +5,16 @@ */ package com.shop.cereshop.business.param.product; +import com.baomidou.mybatisplus.annotation.TableField; import com.shop.cereshop.commons.constant.IntegerEnum; -import com.sun.org.apache.xpath.internal.operations.Bool; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; +import java.util.Map; /** * 商品规格名和值级别数据 @@ -64,4 +65,11 @@ public class SkuNameParam { @Valid private List values; + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuValueParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuValueParam.java index ff2352a..3ae770b 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuValueParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuValueParam.java @@ -5,11 +5,14 @@ */ package com.shop.cereshop.business.param.product; +import com.baomidou.mybatisplus.annotation.TableField; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.Map; /** * 商品规格值数据 @@ -37,4 +40,11 @@ public class SkuValueParam { @ApiModelProperty(value = "图片") private String image; + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/CerePlatformLangInfoService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/CerePlatformLangInfoService.java new file mode 100644 index 0000000..0982bfe --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/CerePlatformLangInfoService.java @@ -0,0 +1,25 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.lang; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; + +import java.util.Map; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformLangInfoService extends IService { + + Map> getAllForMap(); +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/impl/CerePlatformLangInfoServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/impl/CerePlatformLangInfoServiceImpl.java new file mode 100644 index 0000000..a83f039 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/lang/impl/CerePlatformLangInfoServiceImpl.java @@ -0,0 +1,54 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.lang.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageHelper; +import com.shop.cereshop.business.dao.lang.CerePlatformLangInfoDAO; +import com.shop.cereshop.commons.domain.common.Page; +import com.shop.cereshop.commons.domain.lang.CerePlatformLangInfo; +import com.shop.cereshop.business.service.lang.CerePlatformLangInfoService; + +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformLangInfoServiceImpl extends ServiceImpl implements CerePlatformLangInfoService { + + @Override + public Map> getAllForMap() { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + List brandList = baseMapper.selectList(lqw); + Map> result = new HashMap<>(); + Map enMap = new HashMap<>(); + Map zhMap = new HashMap<>(); + for (CerePlatformLangInfo cerePlatformLangInfo : brandList) { + enMap.put(cerePlatformLangInfo.getLangKey(), cerePlatformLangInfo.getLangEn()); + zhMap.put(cerePlatformLangInfo.getLangKey(), cerePlatformLangInfo.getLangZh()); + } + result.put(LangUtil.ZH, zhMap); + result.put(LangUtil.EN, enMap); + return result; + } +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/CerePlatformPermissionLangInfoService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/CerePlatformPermissionLangInfoService.java new file mode 100644 index 0000000..2535c5e --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/CerePlatformPermissionLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.permission; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CerePlatformPermissionLangInfoService extends IService { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java new file mode 100644 index 0000000..52daabf --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.permission.impl; + +import com.shop.cereshop.business.dao.permission.CerePlatformPermissionLangInfoDAO; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; +import com.shop.cereshop.business.service.permission.CerePlatformPermissionLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CerePlatformPermissionLangInfoServiceImpl extends ServiceImpl implements CerePlatformPermissionLangInfoService { +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java index 9598661..84ab542 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/permission/impl/CerePlatformPermissionServiceImpl.java @@ -5,10 +5,12 @@ */ package com.shop.cereshop.business.service.permission.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; import com.shop.cereshop.business.dao.permission.CerePlatformPermissionDAO; +import com.shop.cereshop.business.dao.permission.CerePlatformPermissionLangInfoDAO; import com.shop.cereshop.business.page.permission.MenuButton; import com.shop.cereshop.business.page.permission.Meta; import com.shop.cereshop.business.page.permission.Permission; @@ -23,6 +25,7 @@ import com.shop.cereshop.commons.constant.StringEnum; import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.permission.CerePlatformPermission; +import com.shop.cereshop.commons.domain.permission.CerePlatformPermissionLangInfo; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; import com.shop.cereshop.commons.utils.TimeUtils; @@ -33,10 +36,7 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -46,6 +46,10 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission private CerePlatformPermissionDAO cerePlatformPermissionDAO; @Autowired + private CerePlatformPermissionLangInfoDAO cerePlatformPermissionLangInfoDAO; + + + @Autowired private CerePlatformLogService cerePlatformLogService; @Autowired @@ -64,8 +68,11 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission permission.setIcon(param.getIcon()); permission.setResourceType(param.getResourceType()); permission.setSort(param.getSort()); + if(param.getLangInfoMap().size() <= 0){ + throw new CoBusinessException("10000","请输入菜单名称", ""); + } + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); if(EmptyUtils.isEmpty(permission.getPermissionPid())){ //如果没有父节点id,新增根节点 permission.setPermissionPid(LongEnum.getByName("根节点")); @@ -74,6 +81,12 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission permission.setProject(param.getBusinessId()); cerePlatformPermissionDAO.insert(permission); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","添加权限",permission.getPermissionId(),time); } @@ -91,11 +104,21 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission permission.setIcon(param.getIcon()); permission.setResourceType(param.getResourceType()); permission.setSort(param.getSort()); + if(param.getLangInfoMap().size() <= 0){ + throw new CoBusinessException("10000","请输入菜单名称", ""); + } + permission.setLangInfoMap(param.getLangInfoMap()); permission.initData(); - permission.setPermissionNameJson(new Gson().toJson(param.getPermissionNameMap())); permission.setPermissionId(param.getPermissionId()); permission.setUpdateTime(time); cerePlatformPermissionDAO.updateByPrimaryKeySelective(permission); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permission.getPermissionId())); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CerePlatformPermissionLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setPermissionId(permission.getPermissionId()); + platformPermissionLangInfo.setId(null); + cerePlatformPermissionLangInfoDAO.insert(platformPermissionLangInfo); + } //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","修改权限",permission.getPermissionId(),time); } @@ -108,13 +131,25 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission cerePlatformPermissionDAO.deleteByPrimaryKey(param.getPermissionId()); //同步删除角色关联菜单权限数据 cerePlatformRolePermissionService.deleteByPermissionId(param.getPermissionId()); + cerePlatformPermissionLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,param.getPermissionId())); //新增日志 cerePlatformLogService.addLog(user,"权限管理","平台端操作","删除权限",param.getPermissionId(),time); } @Override public CerePlatformPermission getById(Long permissionId) throws CoBusinessException { - return cerePlatformPermissionDAO.getById(permissionId); + CerePlatformPermission cerePlatformPermission = cerePlatformPermissionDAO.getById(permissionId); + + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().eq(CerePlatformPermissionLangInfo::getPermissionId,permissionId)); + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(cerePlatformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : cerePlatformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + cerePlatformPermission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + cerePlatformPermission.initData(); + return cerePlatformPermission; } @Override @@ -124,12 +159,50 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List list=cerePlatformPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(),param.getPermissionName(),param.getBusinessId()); //查询所有子节点菜单和按钮权限 List childs=cerePlatformPermissionDAO.findChilds(param.getPermissionName(),param.getBusinessId()); + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { - permission.initData(); + permission.initData(ContextUtil.getLanguage()); for (Permission child : childs) { - child.initData(); + child.initData(ContextUtil.getLanguage()); } setMenuChildsIndex(permission,childs,map,null); })); @@ -146,12 +219,51 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission List list=cerePlatformPermissionDAO.findAllByResourceType(StringEnum.CATALOG.getCode(),null,param.getBusinessId()); //查询所有子节点菜单权限 List childs=cerePlatformPermissionDAO.findChilds(null,param.getBusinessId()); + + + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(Permission::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Permission permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (Permission permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { - permission.initData(); + permission.initData(ContextUtil.getLanguage()); for (Permission child : childs) { - child.initData(); + child.initData(ContextUtil.getLanguage()); } setMenuChildsIndex(permission,childs,map,null); })); @@ -176,15 +288,67 @@ public class CerePlatformPermissionServiceImpl implements CerePlatformPermission //查询所有按钮权限 List buttons=cerePlatformPermissionDAO.findAllCatalogByUserIdAndResourceType(user.getBusinessUserId(),StringEnum.BUTTON.getCode(),user.getBusinessId()); + List permissionIdList = new ArrayList<>(); + permissionIdList.addAll(list.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(childs.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList.addAll(buttons.stream().map(MenuButton::getPermissionId).collect(Collectors.toList())); + permissionIdList = permissionIdList.stream().filter(item -> item != null && item > 0) + .distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionIdList)){ + List cerePlatformPermissionLangInfoList = cerePlatformPermissionLangInfoDAO.selectList(Wrappers.lambdaQuery().in(CerePlatformPermissionLangInfo::getPermissionId,permissionIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (MenuButton permission : list) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : childs) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + + for (MenuButton permission : buttons) { + List platformPermissionLangInfoList = + cerePlatformPermissionLangInfoList.stream().filter(item -> Objects.equals(item.getPermissionId(), permission.getPermissionId())).collect(Collectors.toList()); + + Map cerePlatformPermissionLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(platformPermissionLangInfoList)){ + for (CerePlatformPermissionLangInfo cerePlatformPermissionLangInfo : platformPermissionLangInfoList) { + cerePlatformPermissionLangInfoMap.put(cerePlatformPermissionLangInfo.getLanguageType(), cerePlatformPermissionLangInfo); + } + } + permission.setLangInfoMap(cerePlatformPermissionLangInfoMap); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((permission -> { - permission.initData(); + permission.initData(ContextUtil.getLanguage()); for (MenuButton child : childs) { - child.initData(); + child.initData(ContextUtil.getLanguage()); } for (MenuButton button : buttons) { - button.initData(); + button.initData(ContextUtil.getLanguage()); } Meta meta=new Meta(); meta.setTitle(permission.getPermissionName()); diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereProductClassifyLangInfoService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereProductClassifyLangInfoService.java new file mode 100644 index 0000000..cdbdf65 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereProductClassifyLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; + +/** + *

+ * 业务接口 + * + *

+ * + * @author + * @date 2023-12-24 + */ +public interface CereProductClassifyLangInfoService extends IService { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereShopProductLangInfoService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereShopProductLangInfoService.java new file mode 100644 index 0000000..fa14583 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereShopProductLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; + +/** + *

+ * 业务接口 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +public interface CereShopProductLangInfoService extends IService { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameLangInfoService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameLangInfoService.java new file mode 100644 index 0000000..9953013 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameLangInfoService.java @@ -0,0 +1,22 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; + +/** + *

+ * 业务接口 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +public interface CereSkuNameLangInfoService extends IService { + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameService.java index 75450ea..00f2369 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameService.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/CereSkuNameService.java @@ -5,16 +5,18 @@ */ package com.shop.cereshop.business.service.product; +import com.baomidou.mybatisplus.extension.service.IService; import com.shop.cereshop.business.param.product.DeleteSkuParam; import com.shop.cereshop.business.param.product.SkuNameParam; import com.shop.cereshop.business.param.product.SkuNameValueParam; import com.shop.cereshop.business.param.product.SkuValueParam; import com.shop.cereshop.commons.domain.product.CereSkuName; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; import com.shop.cereshop.commons.exception.CoBusinessException; import java.util.List; -public interface CereSkuNameService { +public interface CereSkuNameService extends IService { void insertBatch(List collect) throws CoBusinessException; void deleteBySkuId(Long skuId) throws CoBusinessException; diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyLangInfoServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyLangInfoServiceImpl.java new file mode 100644 index 0000000..ee965bf --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product.impl; + +import com.shop.cereshop.business.dao.product.CereProductClassifyLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; +import com.shop.cereshop.business.service.product.CereProductClassifyLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * + *

+ * + * @author + * @date 2023-12-24 + */ +@Slf4j +@Service +public class CereProductClassifyLangInfoServiceImpl extends ServiceImpl implements CereProductClassifyLangInfoService { +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyServiceImpl.java index 41595fb..3c4099b 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereProductClassifyServiceImpl.java @@ -5,15 +5,17 @@ */ package com.shop.cereshop.business.service.product.impl; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.gson.Gson; import com.shop.cereshop.business.dao.product.CereProductClassifyDAO; import com.shop.cereshop.business.param.product.ClassifyDeleteParam; import com.shop.cereshop.business.param.product.ClassifyGetAllParam; import com.shop.cereshop.business.param.product.ClassifyLevelParam; import com.shop.cereshop.business.param.product.ProductGetClassifyParam; import com.shop.cereshop.business.service.log.CerePlatformLogService; +import com.shop.cereshop.business.service.product.CereProductClassifyLangInfoService; import com.shop.cereshop.business.service.product.CereProductClassifyService; import com.shop.cereshop.business.utils.ContextUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; @@ -22,10 +24,13 @@ import com.shop.cereshop.commons.constant.LongEnum; import com.shop.cereshop.commons.domain.business.CerePlatformBusinessUser; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.domain.product.CereProductClassify; +import com.shop.cereshop.commons.domain.product.CereProductClassifyLangInfo; import com.shop.cereshop.commons.domain.product.CereShopProduct; import com.shop.cereshop.commons.domain.product.Classify; +import com.shop.cereshop.commons.domain.user.CerePlatformUser; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.utils.EmptyUtils; +import com.shop.cereshop.commons.utils.ProjectUtil; import com.shop.cereshop.commons.utils.TimeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,10 +38,8 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Service public class CereProductClassifyServiceImpl implements CereProductClassifyService { @@ -45,13 +48,21 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic private CereProductClassifyDAO cereProductClassifyDAO; @Autowired + private CereProductClassifyLangInfoService cereProductClassifyLangInfoService; + + @Autowired private CerePlatformLogService cerePlatformLogService; @Override public List getClassifySelect(ProductGetClassifyParam param) throws CoBusinessException { List classifyList = cereProductClassifyDAO.getClassifySelect(ContextUtil.getProject(), param.getClassifyPid()); - for (CereProductClassify classify : classifyList) { - classify.initData(ContextUtil.getLanguage()); + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, classifyList.stream().map(CereProductClassify::getClassifyId))); + if (CollectionUtils.isNotEmpty(classifyList)) { + for (CereProductClassify classify : classifyList) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(ContextUtil.getLanguage()); + } } return classifyList; } @@ -59,7 +70,10 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic @Override public CereProductClassify findByHierarchy(String hierarchy) throws CoBusinessException { CereProductClassify classify = cereProductClassifyDAO.findByHierarchy(ContextUtil.getProject(), hierarchy); -// classify.initData(); + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, Collections.singletonList(classify.getClassifyId()))); + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(ContextUtil.getLanguage()); return classify; } @@ -69,6 +83,26 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic List list=cereProductClassifyDAO.findAll(ContextUtil.getProject()); //查询所有子节点类目 List childs=cereProductClassifyDAO.findChilds(ContextUtil.getProject()); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(Classify::getId).collect(Collectors.toList())); + classifyIdList.addAll(childs.stream().map(Classify::getId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(!EmptyUtils.isEmpty(list)){ + for (Classify classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + } + + for (Classify classify : childs) { + classify.initMap(cereProductClassifyLangInfoList); + } + } + + } + if(!EmptyUtils.isEmpty(list)){ Map map=new HashMap<>(); list.forEach((classify -> { @@ -85,8 +119,19 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic @Override public List selectAll() throws CoBusinessException { List classifyList = cereProductClassifyDAO.selectAll(ContextUtil.getProject()); - for (CereProductClassify classify : classifyList) { - classify.initData(ContextUtil.getLanguage()); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(classifyList.stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(!CollectionUtils.isNotEmpty(classifyList)){ + for (CereProductClassify classify : classifyList) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(ContextUtil.getLanguage()); + } + } } return classifyList; } @@ -138,22 +183,33 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time= TimeUtils.yyMMddHHmmss(); //定义批量更新层级结构字段数组 List updates=new ArrayList<>(); + List updateIds=new ArrayList<>(); + List langInfoList = new ArrayList<>(); if(!EmptyUtils.isEmpty(param.getClassifies())){ //遍历一级类别 for (CereProductClassify classify:param.getClassifies()) { //新增一级类别数据 - addOneClassify(classify,time,updates); + addOneClassify(classify,time,updates, updateIds, langInfoList); } if(!EmptyUtils.isEmpty(updates)){ //批量更新分类层级结构 cereProductClassifyDAO.updateBatchLevelHierarchy(updates); } + if(!EmptyUtils.isEmpty(updateIds)){ + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, updateIds)); + } + if(CollectionUtils.isNotEmpty(langInfoList)) { + cereProductClassifyLangInfoService.saveBatch(langInfoList); + } } //新增日志 cerePlatformLogService.addLog(user,"商品类别","平台端操作","添加商品类别",null,time); } - private void addOneClassify(CereProductClassify classify, String time,List updates) throws CoBusinessException{ + private void addOneClassify(CereProductClassify classify, String time, + List updates, List updateIds, + List langInfoList) throws CoBusinessException{ if(EmptyUtils.isEmpty(classify.getClassifyName())){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_NAME_NULL); } @@ -164,12 +220,10 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic cereProductClassify.setClassifyImage(classify.getClassifyImage()); cereProductClassify.setClassifyLevel(IntegerEnum.CLASSIFY_LEVEL_ONE.getCode()); cereProductClassify.setLink(classify.getLink()); - cereProductClassify.setProject(ContextUtil.getProject()); + cereProductClassify.setProject(ProjectUtil.DEFAULT_PROJECT); cereProductClassify.setClassifyHierarchy("-"+classify.getClassifyName()); - cereProductClassify.setClassifyNameJson(classify.getClassifyNameJson()); - cereProductClassify.setClassifyNameMap(classify.getClassifyNameMap()); + cereProductClassify.setLangInfoMap(classify.getLangInfoMap()); cereProductClassify.initData(); - cereProductClassify.setClassifyNameJson(new Gson().toJson(cereProductClassify.getClassifyNameMap())); if(!EmptyUtils.isLongEmpty(classify.getClassifyId())){ //更新一级类别 cereProductClassify.setUpdateTime(time); @@ -182,17 +236,27 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic cereProductClassify.setClassifyLevelHierarchy("/"+cereProductClassify.getClassifyId()); updates.add(cereProductClassify); } + updateIds.add(cereProductClassify.getClassifyId()); + + for (Map.Entry productClassifyLangInfoEntry : cereProductClassify.getLangInfoMap().entrySet()) { + CereProductClassifyLangInfo productClassifyLangInfo = productClassifyLangInfoEntry.getValue(); + productClassifyLangInfo.setClassifyId(classify.getClassifyId()); + productClassifyLangInfo.setId(null); + langInfoList.add(productClassifyLangInfo); + } + if(!EmptyUtils.isEmpty(classify.getChilds())){ //新增子级类别 for (CereProductClassify productClassify:classify.getChilds()) { - addChildClaasify(cereProductClassify, - updates,time,productClassify,IntegerEnum.CLASSIFY_LEVEL_TWO.getCode()); + addChildClaasify(cereProductClassify, updates,updateIds,time,productClassify,IntegerEnum.CLASSIFY_LEVEL_TWO.getCode(), langInfoList); } } } private void addChildClaasify(CereProductClassify parent, List updates, - String time, CereProductClassify child,Integer level) throws CoBusinessException{ + List updateIds, + String time, CereProductClassify child,Integer level, + List langInfoList) throws CoBusinessException{ if(EmptyUtils.isEmpty(child.getClassifyName())){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_NAME_NULL); } @@ -203,12 +267,10 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic productClassify.setClassifyLevel(level); productClassify.setLink(child.getLink()); productClassify.setClassifyImage(child.getClassifyImage()); - productClassify.setProject(ContextUtil.getProject()); + productClassify.setProject(ProjectUtil.DEFAULT_PROJECT); productClassify.setClassifyHierarchy(parent.getClassifyHierarchy()+"-"+child.getClassifyName()); - productClassify.setClassifyNameJson(child.getClassifyNameJson()); - productClassify.setClassifyNameMap(child.getClassifyNameMap()); + productClassify.setLangInfoMap(child.getLangInfoMap()); productClassify.initData(); - productClassify.setClassifyNameJson(new Gson().toJson(productClassify.getClassifyNameMap())); if(!EmptyUtils.isLongEmpty(child.getClassifyId())){ //更新子级类别 productClassify.setUpdateTime(time); @@ -221,10 +283,19 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic productClassify.setClassifyLevelHierarchy(parent.getClassifyLevelHierarchy()+"/"+productClassify.getClassifyId()); updates.add(productClassify); } + updateIds.add(productClassify.getClassifyId()); + + for (Map.Entry productClassifyLangInfoEntry : productClassify.getLangInfoMap().entrySet()) { + CereProductClassifyLangInfo productClassifyLangInfo = productClassifyLangInfoEntry.getValue(); + productClassifyLangInfo.setClassifyId(child.getClassifyId()); + productClassifyLangInfo.setId(null); + langInfoList.add(productClassifyLangInfo); + } + if(!EmptyUtils.isEmpty(child.getChilds())){ //新增子级类别 for (CereProductClassify classify1:child.getChilds()) { - addChildClaasify(productClassify,updates,time,classify1,IntegerEnum.CLASSIFY_LEVEL_THREE.getCode()); + addChildClaasify(productClassify,updates,updateIds, time,classify1,IntegerEnum.CLASSIFY_LEVEL_THREE.getCode(),langInfoList); } } } @@ -235,43 +306,74 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time=TimeUtils.yyMMddHHmmss(); //定义批量更新层级结构字段数组 List updates=new ArrayList<>(); + List updateIds=new ArrayList<>(); + List langInfoList = new ArrayList<>(); if(!EmptyUtils.isEmpty(param.getClassifies())){ for (CereProductClassify classify:param.getClassifies()) { - addOneClassify(classify,time,updates); + addOneClassify(classify,time,updates, updateIds, langInfoList); } if(!EmptyUtils.isEmpty(updates)){ //批量更新分类层级结构 cereProductClassifyDAO.updateBatchLevelHierarchy(updates); } + if(!EmptyUtils.isEmpty(updateIds)){ + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, updateIds)); + } if(!EmptyUtils.isEmpty(param.getDeleteIds())){ //删除分类 cereProductClassifyDAO.deleteByIds(param.getDeleteIds()); + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, param.getDeleteIds())); + + } + if(CollectionUtils.isNotEmpty(langInfoList)) { + cereProductClassifyLangInfoService.saveBatch(langInfoList); } } //新增日志 cerePlatformLogService.addLog(user,"商品类别","平台端操作","修改商品类别",null,time); } + @Override public CereProductClassify getById(Long classifyId) throws CoBusinessException { //查询一级类别数据 + List classifyIdList = new ArrayList<>(); CereProductClassify classify=cereProductClassifyDAO.selectByPrimaryKey(classifyId); if(classify!=null){ - classify.initData(); + classifyIdList.add(classify.getClassifyId()); //查询所有二级分类 List classifies=cereProductClassifyDAO.findByPid(classify.getClassifyId()); if(!EmptyUtils.isEmpty(classifies)){ - //查询所有三级分类 - classifies.forEach(a -> { - a.setChilds( cereProductClassifyDAO.findByPid(a.getClassifyId())); - a.initData(); - if(a.getChilds() != null){ - for (CereProductClassify child : a.getChilds()) { - child.initData(); + classifyIdList.addAll(classifies.stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + for (CereProductClassify a : classifies) { + //查询所有三级分类 + a.setChilds(cereProductClassifyDAO.findByPid(a.getClassifyId())); + classifyIdList.addAll(a.getChilds().stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + } + classify.setChilds(classifies); + } + } + + if(CollectionUtils.isNotEmpty(classifyIdList)) { + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId, classifyIdList)); + if (!EmptyUtils.isEmpty(classify)) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + if(CollectionUtils.isNotEmpty(classify.getChilds())) { + for (CereProductClassify secondClassify : classify.getChilds()) { + secondClassify.initMap(cereProductClassifyLangInfoList); + secondClassify.initData(); + if(CollectionUtils.isNotEmpty(secondClassify.getChilds())) { + for (CereProductClassify thirdClassify : classify.getChilds()) { + thirdClassify.initMap(cereProductClassifyLangInfoList); + thirdClassify.initData(); + } } } - }); - classify.setChilds(classifies); + } } } return classify; @@ -281,8 +383,18 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic public Page getAll(ClassifyGetAllParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); List list=cereProductClassifyDAO.getAll(ContextUtil.getProject()); - for (CereProductClassify classify : list) { - classify.initData(ContextUtil.getLanguage()); + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(CereProductClassify::getClassifyId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = cereProductClassifyLangInfoService.list(Wrappers.lambdaQuery().in(CereProductClassifyLangInfo::getClassifyId,classifyIdList)); + if(!CollectionUtils.isNotEmpty(list)){ + for (CereProductClassify classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(ContextUtil.getLanguage()); + } + } } PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); @@ -300,9 +412,11 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic String time =TimeUtils.yyMMddHHmmss(); //查询一级类别层级 CereProductClassify classify=cereProductClassifyDAO.selectById(param.getOneClassifyId()); + List deleteIdList = new ArrayList<>(); if(classify!=null){ //删除一级类别 cereProductClassifyDAO.deleteByPrimaryKey(param.getOneClassifyId()); + deleteIdList.add(param.getOneClassifyId()); String[] split = classify.getClassifyLevelHierarchy().split("/"); if(!EmptyUtils.isEmpty(split)){ if(split.length==3){ @@ -311,6 +425,7 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-1])); //删除二级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-1])); }else if(split.length==4){ @@ -320,6 +435,7 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-2])); //删除二级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-2])); //校验当前三级类别是否有绑定商品数据 @@ -327,11 +443,17 @@ public class CereProductClassifyServiceImpl implements CereProductClassifyServic if(!EmptyUtils.isEmpty(list)){ throw new CoBusinessException(CoReturnFormat.CLASSIFY_BOND_PRODUCT); } + deleteIdList.add(Long.parseLong(split[split.length-1])); //删除三级类别 cereProductClassifyDAO.deleteByPrimaryKey(Long.parseLong(split[split.length-1])); } } } + if(CollectionUtils.isNotEmpty(deleteIdList)) { + deleteIdList = deleteIdList.stream().distinct().collect(Collectors.toList()); + cereProductClassifyLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereProductClassifyLangInfo::getClassifyId, deleteIdList)); + } //新增日志 cerePlatformLogService.addLog(user,"商品类别","平台端操作","删除商品类别", param.getOneClassifyId(),time); } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductLangInfoServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductLangInfoServiceImpl.java new file mode 100644 index 0000000..ff30879 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product.impl; + +import com.shop.cereshop.business.dao.product.CereShopProductLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereShopProductLangInfo; +import com.shop.cereshop.business.service.product.CereShopProductLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 店铺商品信息表 + *

+ * + * @author + * @date 2024-01-07 + */ +@Slf4j +@Service +public class CereShopProductLangInfoServiceImpl extends ServiceImpl implements CereShopProductLangInfoService { +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java index e2dd800..e3f2af8 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereShopProductServiceImpl.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.business.service.product.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -12,6 +13,7 @@ import com.google.gson.Gson; import com.shop.cereshop.business.dao.brand.BrandDAO; import com.shop.cereshop.business.dao.product.CereProductClassifyDAO; import com.shop.cereshop.business.dao.product.CereShopProductDAO; +import com.shop.cereshop.business.dao.product.CereShopProductLangInfoDAO; import com.shop.cereshop.business.page.canvas.CanvasProduct; import com.shop.cereshop.business.page.canvas.CanvasProductParam; import com.shop.cereshop.business.page.canvas.CanvasShop; @@ -30,6 +32,7 @@ import com.shop.cereshop.business.service.tool.CereShopCouponDetailService; import com.shop.cereshop.business.service.tool.CereShopCouponService; import com.shop.cereshop.business.service.tool.CereShopDiscountDetailService; import com.shop.cereshop.business.service.tool.CereShopSeckillDetailService; +import com.shop.cereshop.business.utils.ContextUtil; import com.shop.cereshop.commons.cache.constants.CacheKeyConstants; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.constant.IntegerEnum; @@ -45,10 +48,7 @@ import com.shop.cereshop.commons.domain.tool.CereShopDiscountDetail; import com.shop.cereshop.commons.domain.tool.CereShopSeckillDetail; import com.shop.cereshop.commons.exception.CoBusinessException; import com.shop.cereshop.commons.poi.ImportExeclUtil; -import com.shop.cereshop.commons.utils.EmptyUtils; -import com.shop.cereshop.commons.utils.ProjectInvokeUtil; -import com.shop.cereshop.commons.utils.StringUtils; -import com.shop.cereshop.commons.utils.TimeUtils; +import com.shop.cereshop.commons.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.Workbook; @@ -117,6 +117,14 @@ public class CereShopProductServiceImpl implements CereShopProductService { @Autowired private CereProductClassifyDAO cereProductClassifyDAO; + @Autowired + private CereShopProductLangInfoService shopProductLangInfoService; + + @Autowired + private CereShopProductLangInfoDAO shopProductLangInfoDAO; + + @Autowired + private CereSkuNameLangInfoService cereSkuNameLangInfoService; @Override @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) public void save(ProductSaveParam param, CerePlatformBusinessUser user) throws CoBusinessException { @@ -149,6 +157,10 @@ public class CereShopProductServiceImpl implements CereShopProductService { cereShopProduct.setCreateTime(time); cereShopProduct.setUpdateTime(time); cereShopProduct.setShopId(param.getShopId()); + + cereShopProduct.setLangInfoMap(param.getLangInfoMap()); + cereShopProduct.initData(); + cereShopProductDAO.insert(cereShopProduct); if(!EmptyUtils.isEmpty(param.getImages())){ @@ -193,11 +205,49 @@ public class CereShopProductServiceImpl implements CereShopProductService { cereShopCouponDetailService.insertBatch(details); } //新增规格数据 - saveSkus(param.getSkus(),cereShopProduct,null,time,map,param.getNames()); + List changeResult = saveSkus(param.getSkus(),cereShopProduct,null,time,map, param.getNames()); + + //新增多语言数据 + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CereShopProductLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setProductId(cereShopProduct.getProductId()); + platformPermissionLangInfo.setId(null); + shopProductLangInfoDAO.insert(platformPermissionLangInfo); + } + + //规格多语言处理 + updateSkuLangInfo(changeResult.stream().map(item-> "" + item.getSkuId()).collect(Collectors.toList()), param.getNames() ); //新增日志 cerePlatformLogService.addLog(user,"商品管理","商户端操作","添加商品",cereShopProduct.getProductId(),time); } + private void updateSkuLangInfo(List skuIdList, List names){ + List cereSkuNameLangInfoList = new ArrayList<>(); + List cereSkuNameList = cereSkuNameService.list(Wrappers.lambdaQuery().in(CereSkuName::getSkuId, skuIdList)); + for (CereSkuName cereSkuName : cereSkuNameList) { + SkuNameParam name = names.stream().filter(item -> StringUtils.equals(cereSkuName.getNameCode(), item.getCode())).findFirst().orElse(null); + SkuValueParam value = name.getValues().stream().filter(item -> StringUtils.equals(cereSkuName.getValueCode(), item.getValueCode())).findFirst().orElse(null); + + CereSkuNameLangInfo skuNameLangInfo_zh = new CereSkuNameLangInfo(); + skuNameLangInfo_zh.setSkuUniId(cereSkuName.getUniId()); + skuNameLangInfo_zh.setSkuName(name.getLangInfoMap().get(LangUtil.ZH).getSkuName()); + skuNameLangInfo_zh.setSkuValue(value.getLangInfoMap().get(LangUtil.ZH).getSkuValue()); + skuNameLangInfo_zh.setLanguageType(LangUtil.ZH); + cereSkuNameLangInfoList.add(skuNameLangInfo_zh); + + CereSkuNameLangInfo skuNameLangInfo_en = new CereSkuNameLangInfo(); + skuNameLangInfo_en.setSkuUniId(cereSkuName.getUniId()); + skuNameLangInfo_en.setSkuName(name.getLangInfoMap().get(LangUtil.EN).getSkuName()); + skuNameLangInfo_en.setSkuValue(value.getLangInfoMap().get(LangUtil.EN).getSkuValue()); + skuNameLangInfo_en.setLanguageType(LangUtil.EN); + cereSkuNameLangInfoList.add(skuNameLangInfo_en); + } + cereSkuNameLangInfoService.remove(Wrappers.lambdaQuery() + .in(CereSkuNameLangInfo::getSkuUniId, + cereSkuNameList.stream().map(CereSkuName::getUniId).collect(Collectors.toList()) )); + cereSkuNameLangInfoService.saveBatch(cereSkuNameLangInfoList); + } + @Override @Transactional(isolation= Isolation.DEFAULT,propagation= Propagation.REQUIRED,rollbackFor = {CoBusinessException.class, Exception.class}) public void update(ProductUpdateParam param, CerePlatformBusinessUser user) throws CoBusinessException { @@ -269,6 +319,10 @@ public class CereShopProductServiceImpl implements CereShopProductService { cereShopProduct.setUpdateTime(time); cereShopProduct.setShopId(param.getShopId()); + + cereShopProduct.setLangInfoMap(param.getLangInfoMap()); + cereShopProduct.initData(); + cereShopProductDAO.updateByPrimaryKeySelective(cereShopProduct); if(!EmptyUtils.isEmpty(param.getImages())){ @@ -301,12 +355,41 @@ public class CereShopProductServiceImpl implements CereShopProductService { map.put(a.getCode()+"-"+value.getValueCode(),nameValue); }); }); + +// if(CollectionUtils.isNotEmpty(param.getSkus())){ +// List newSkuIdList = param.getSkus().stream().map(SkuParam::getSkuId).filter(ObjectUtils::isNotNull).distinct().collect(Collectors.toList()) +// List dbSkuList=cereProductSkuService.findByProductId(param.getProductId()); +// +// List deletes = new ArrayList<>(); +// for (Sku sku : dbSkuList) { +// if(!newSkuIdList.contains(sku.getSkuId())){ +// DeleteSkuParam deleteSkuParam = new DeleteSkuParam(); +// deleteSkuParam.setSkuId(sku.getSkuId()); +// deleteSkuParam.setCode(sku.getSkuCode()); +// deleteSkuParam.setValueCode(sku); +// deletes.add(deleteSkuParam); +// } +// } +// } + //更新规格数据 - saveSkus(param.getSkus(),cereShopProduct,param.getDeletes(),time,map,param.getNames()); + //新增规格数据 + List changeResult = saveSkus(param.getSkus(),cereShopProduct,param.getDeletes() ,time,map,param.getNames()); //清除缓存 triggerCacheUpdate(param.getProductId()); //商品删除之后需删除购物车相关的商品 cereShopProductDAO.deleteShopCartByProductId(param.getProductId()); + + shopProductLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CereShopProductLangInfo::getProductId,cereShopProduct.getProductId())); + for (Map.Entry platformPermissionLangInfoEntry : param.getLangInfoMap().entrySet()) { + CereShopProductLangInfo platformPermissionLangInfo = platformPermissionLangInfoEntry.getValue(); + platformPermissionLangInfo.setProductId(cereShopProduct.getProductId()); + platformPermissionLangInfo.setId(null); + shopProductLangInfoDAO.insert(platformPermissionLangInfo); + } + + //规格多语言处理 + updateSkuLangInfo(changeResult.stream().map(item-> "" + item.getSkuId()).collect(Collectors.toList()), param.getNames() ); //新增日志 cerePlatformLogService.addLog(user,"商品管理","商户端操作","修改商品",cereShopProduct.getProductId(),time); } @@ -347,6 +430,8 @@ public class CereShopProductServiceImpl implements CereShopProductService { triggerCacheUpdate(param.getProductId()); //调用接口删除实时信息 projectInvokeUtil.postRefreshSkuRealInfo(param.getProductId(), null, RefreshSkuRealInfoSourceEnum.PUT_OFF_SHELVE, null); + //删除多语言信息 + shopProductLangInfoDAO.delete(Wrappers.lambdaQuery().eq(CereShopProductLangInfo::getProductId,param.getProductId())); //新增日志 cerePlatformLogService.addLog(user,"商品管理","商户端操作","删除商品",param.getProductId(),time); } @@ -359,31 +444,93 @@ public class CereShopProductServiceImpl implements CereShopProductService { List images=cereProductImageService.findByProductId(productId); //查询规格信息 List skus=cereProductSkuService.findByProductId(productId); - //查询规格名数据 - List names = cereSkuNameService.findNameByProductId(productId); - if(!EmptyUtils.isEmpty(names)){ - if(!EmptyUtils.isEmpty(names.get(0).getSkuName())){ - //多款式 - names.forEach(a -> a.setValues(cereSkuNameService.findByName(a.getSkuName(),productId))); - }else { - //单款式,查询规格值数据 - CereSkuName value = cereSkuNameService.findValueByProductId(productId); - if(value!=null){ - List values=new ArrayList<>(); - SkuValueParam skuValueParam=new SkuValueParam(); - skuValueParam.setValueCode(value.getValueCode()); - skuValueParam.setSkuValue(value.getSkuValue()); - skuValueParam.setImage(value.getImage()); - values.add(skuValueParam); - names.get(0).setValues(values); - } + //SKU详细数据 + List skuIdList = skus.stream().map(Sku::getSkuId).distinct().collect(Collectors.toList()); + List cereSkuNameList = cereSkuNameService.list(Wrappers.lambdaQuery().in(CereSkuName::getSkuId, skuIdList)); + + //SKU的多语言名称 + List cereSkuNameLangKeyList = cereSkuNameList.stream().map(CereSkuName::getUniId).collect(Collectors.toList()); + List cereSkuNameLangInfoList = cereSkuNameLangInfoService.list(Wrappers.lambdaQuery().in(CereSkuNameLangInfo::getSkuUniId, cereSkuNameLangKeyList)); + + Map> cereSkuNameListMap = cereSkuNameList.stream().collect(Collectors.groupingBy(CereSkuName::getNameCode, LinkedHashMap::new, Collectors.toList())); + + for (CereSkuName cereSkuName : cereSkuNameList) { + cereSkuName.initMap(cereSkuNameLangInfoList); + cereSkuName.initData(ContextUtil.getLanguage()); + } + + List names = new ArrayList<>(); + for (List skuNameList : cereSkuNameListMap.values()) { + CereSkuName firstSkuName = skuNameList.get(0); + SkuNameParam skuNameParam = new SkuNameParam(); + skuNameParam.setSkuId(firstSkuName.getSkuId()); + skuNameParam.setCode(firstSkuName.getNameCode()); + skuNameParam.setSkuName(firstSkuName.getSkuName()); + skuNameParam.setNeed(firstSkuName.getNeed()); + skuNameParam.setLangInfoMap(firstSkuName.getLangInfoMap()); + List values=new ArrayList<>(); + for (List cereSkuNameValueList : skuNameList.stream().collect(Collectors.groupingBy(CereSkuName::getValueCode, LinkedHashMap::new, Collectors.toList())).values()) { + CereSkuName cereSkuName = cereSkuNameValueList.get(0); + SkuValueParam skuValueParam=new SkuValueParam(); + skuValueParam.setValueCode(cereSkuName.getValueCode()); + skuValueParam.setSkuValue(cereSkuName.getSkuValue()); + skuValueParam.setImage(cereSkuName.getImage()); + skuValueParam.setLangInfoMap(cereSkuName.getLangInfoMap()); + values.add(skuValueParam); } + skuNameParam.setValues(values); + names.add(skuNameParam); } + //查询规格名数据 +// List names = cereSkuNameService.findNameByProductId(productId); +// if(!EmptyUtils.isEmpty(names)){ +// if(!EmptyUtils.isEmpty(names.get(0).getSkuName())){ +// //多款式 +// names.forEach(a -> a.setValues(cereSkuNameService.findByName(a.getSkuName(),productId))); +// }else { +// //单款式,查询规格值数据 +// CereSkuName value = cereSkuNameService.findValueByProductId(productId); +// if(value!=null){ +// List values=new ArrayList<>(); +// SkuValueParam skuValueParam=new SkuValueParam(); +// skuValueParam.setValueCode(value.getValueCode()); +// skuValueParam.setSkuValue(value.getSkuValue()); +// skuValueParam.setImage(value.getImage()); +// values.add(skuValueParam); +// names.get(0).setValues(values); +// } +// } +// } //封装规格里面的规格名和值级别数据 - skus.forEach(sku -> sku.setSkuAttrCodeDTOList(cereSkuNameService.findBySkuId(sku.getSkuId()))); + Map> cereSkuNameListMapBySkuId = cereSkuNameList.stream().collect(Collectors.groupingBy(CereSkuName::getSkuId)); + for (Sku sku : skus) { + if(cereSkuNameListMapBySkuId.containsKey(sku.getSkuId())){ + sku.setCereSkuNames(cereSkuNameListMapBySkuId.get(sku.getSkuId())); + sku.setSkuAttrCodeDTOList(sku.getCereSkuNames().stream().map(item -> { + SkuNameValueParam skuNameValueParam = new SkuNameValueParam(); + skuNameValueParam.setCode(item.getNameCode()); + skuNameValueParam.setValueCode(item.getValueCode()); + return skuNameValueParam; + }).collect(Collectors.toList())); + } + } +// skus.forEach(sku -> sku.setSkuAttrCodeDTOList(cereSkuNameService.findBySkuId(sku.getSkuId()))); shopProduct.setImages(EmptyUtils.getImages(images)); shopProduct.setSkus(skus); shopProduct.setNames(names); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll( Collections.singletonList(shopProduct.getProductId())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(ObjectUtils.isNotNull(shopProduct)){ + shopProduct.initMap(cereProductClassifyLangInfoList); + shopProduct.initData(); + } + } + return shopProduct; } @@ -462,6 +609,20 @@ public class CereShopProductServiceImpl implements CereShopProductService { } } })); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(ShopProduct::getProductId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (ShopProduct classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } + } + } } PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); @@ -520,6 +681,20 @@ public class CereShopProductServiceImpl implements CereShopProductService { } } })); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(ShopProduct::getProductId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (ShopProduct classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } + } + } } return list; } @@ -595,6 +770,20 @@ public class CereShopProductServiceImpl implements CereShopProductService { public Page getProducts(CanvasProductParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); List list=cereShopProductDAO.getProducts(param); + + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(CanvasProduct::getProductId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (CanvasProduct classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } + } + } PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; @@ -625,12 +814,40 @@ public class CereShopProductServiceImpl implements CereShopProductService { @Override public List selectAll() { - return cereShopProductDAO.selectAll(); + List list = cereShopProductDAO.selectAll(); + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(CereShopProduct::getProductId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (CereShopProduct classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } + } + } + return list; } @Override public List selectAllByShopId(Long shopId) { - return cereShopProductDAO.selectAllByShopId(shopId); + List list = cereShopProductDAO.selectAllByShopId(shopId); + List classifyIdList = new ArrayList<>(); + classifyIdList.addAll(list.stream().map(CereShopProduct::getProductId).collect(Collectors.toList())); + classifyIdList = classifyIdList.stream().filter(item -> item != null && item > 0).distinct().collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(classifyIdList)){ + List cereProductClassifyLangInfoList = shopProductLangInfoService.list(Wrappers.lambdaQuery().in(CereShopProductLangInfo::getProductId,classifyIdList)); + if(CollectionUtils.isNotEmpty(list)){ + for (CereShopProduct classify : list) { + classify.initMap(cereProductClassifyLangInfoList); + classify.initData(); + } + } + } + return list; } @Override @@ -843,8 +1060,9 @@ public class CereShopProductServiceImpl implements CereShopProductService { } } - private void saveSkus(List skus, CereShopProduct cereShopProduct, List deletes, + private List saveSkus(List skus, CereShopProduct cereShopProduct, List deletes, String time,Map map,List names) throws CoBusinessException{ + List changeResult = new ArrayList<>(); if(!EmptyUtils.isEmpty(skus)){ for (SkuParam sku:skus) { CereProductSku cereProductSku=new CereProductSku(); @@ -867,6 +1085,7 @@ public class CereShopProductServiceImpl implements CereShopProductService { cereProductSku.setCreateTime(time); //新增规格 cereProductSkuService.insert(cereProductSku); + changeResult.add(cereProductSku); //将商品库存数量放到redis中 //stringRedisService.set(String.valueOf(cereProductSku.getSkuId()),cereProductSku.getStockNumber()); //同步新增规格名和规格值关联数据 @@ -923,6 +1142,7 @@ public class CereShopProductServiceImpl implements CereShopProductService { //更新规格 cereProductSku.setUpdateTime(time); cereProductSkuService.update(cereProductSku); + changeResult.add(cereProductSku); //同步更新秒杀活动商品价格 updateSeckillProduct(cereProductSku,cereShopProduct.getShopId()); //同步更新限时折扣活动商品价格 @@ -979,6 +1199,8 @@ public class CereShopProductServiceImpl implements CereShopProductService { cereSkuNameService.deleteByIds(ids); } } + + return changeResult; } private void updateDiscountProduct(CereProductSku cereProductSku, Long shopId) throws CoBusinessException { diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameLangInfoServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameLangInfoServiceImpl.java new file mode 100644 index 0000000..62def29 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameLangInfoServiceImpl.java @@ -0,0 +1,28 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.business.service.product.impl; + +import com.shop.cereshop.business.dao.product.CereSkuNameLangInfoDAO; +import com.shop.cereshop.commons.domain.product.CereSkuNameLangInfo; +import com.shop.cereshop.business.service.product.CereSkuNameLangInfoService; + +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务实现类 + * 商品规格属性信息表 + *

+ * + * @author + * @date 2024-01-11 + */ +@Slf4j +@Service +public class CereSkuNameLangInfoServiceImpl extends ServiceImpl implements CereSkuNameLangInfoService { +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameServiceImpl.java index 772a4ef..2155217 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/product/impl/CereSkuNameServiceImpl.java @@ -5,6 +5,7 @@ */ package com.shop.cereshop.business.service.product.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.shop.cereshop.business.dao.product.CereSkuNameDAO; import com.shop.cereshop.business.param.product.DeleteSkuParam; import com.shop.cereshop.business.param.product.SkuNameParam; @@ -19,7 +20,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class CereSkuNameServiceImpl implements CereSkuNameService { +public class CereSkuNameServiceImpl extends ServiceImpl implements CereSkuNameService { @Autowired private CereSkuNameDAO cereSkuNameDAO; diff --git a/cereshop-business/src/main/resources/application-security.yml b/cereshop-business/src/main/resources/application-security.yml index e281f27..9029788 100644 --- a/cereshop-business/src/main/resources/application-security.yml +++ b/cereshop-business/src/main/resources/application-security.yml @@ -39,3 +39,4 @@ security: - /order/syncOrderList - /product/syncProductList - /order/getOrderDetailForScrm + - /cerePlatformLangInfo/** diff --git a/cereshop-business/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml new file mode 100644 index 0000000..cb6da95 --- /dev/null +++ b/cereshop-business/src/main/resources/mybatis/mapper/lang/CerePlatformLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, lang_key, lang_desc, lang_zh, lang_en + + + diff --git a/cereshop-business/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml index 5d32040..85d3750 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/permission/CerePlatformPermissionDAO.xml @@ -5,7 +5,6 @@ - @@ -17,7 +16,7 @@ - permission_id, permission_pid, permission_name, permission_name_json, permission_uri, permission, icon, + permission_id, permission_pid, permission_name, permission_uri, permission, icon, `describe`, resource_type, sort, project, create_time, update_time - SELECT permission_id,permission_pid,permission_name, permission_name_json, permission_uri,permission,icon,`describe`,resource_type,sort FROM cere_platform_permission where permission_id=#{permissionId} + SELECT permission_id,permission_pid,permission_name, permission_uri,permission,icon,`describe`,resource_type,sort FROM cere_platform_permission where permission_id=#{permissionId} select @@ -48,9 +47,6 @@ classify_name, - - classify_name_json, - classify_image, @@ -86,9 +82,6 @@ #{classifyName,jdbcType=VARCHAR}, - - #{classifyNameJson,jdbcType=VARCHAR}, - #{classifyImage,jdbcType=VARCHAR}, @@ -127,9 +120,6 @@ classify_name = #{classifyName,jdbcType=VARCHAR}, - - classify_name_json = #{classifyNameJson,jdbcType=VARCHAR}, - classify_image = #{classifyImage,jdbcType=VARCHAR}, @@ -158,7 +148,6 @@ classify_level = #{classifyLevel,jdbcType=TINYINT}, classify_level_hierarchy = #{classifyLevelHierarchy,jdbcType=VARCHAR}, classify_name = #{classifyName,jdbcType=VARCHAR}, - classify_name_json = #{classifyNameJson,jdbcType=VARCHAR}, classify_image = #{classifyImage,jdbcType=VARCHAR}, sort = #{sort,jdbcType=INTEGER}, link = #{link,jdbcType=BIGINT}, @@ -169,7 +158,7 @@ @@ -231,7 +220,7 @@ diff --git a/cereshop-business/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml new file mode 100644 index 0000000..52e78db --- /dev/null +++ b/cereshop-business/src/main/resources/mybatis/mapper/product/CereProductClassifyLangInfoDAO.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, classify_id, classify_name, language_type + + + diff --git a/cereshop-business/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml new file mode 100644 index 0000000..ea27d8c --- /dev/null +++ b/cereshop-business/src/main/resources/mybatis/mapper/product/CereShopProductLangInfoDAO.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + id, product_id, product_name, product_brief, product_text, language_type + + + diff --git a/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameDAO.xml index a008dfe..4eef5a3 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameDAO.xml @@ -164,7 +164,8 @@ diff --git a/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml new file mode 100644 index 0000000..acd9ffe --- /dev/null +++ b/cereshop-business/src/main/resources/mybatis/mapper/product/CereSkuNameLangInfoDAO.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, sku_uni_id, sku_name, sku_value, language_type + + + diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/lang/CerePlatformLangInfo.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/lang/CerePlatformLangInfo.java new file mode 100644 index 0000000..b74521d --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/lang/CerePlatformLangInfo.java @@ -0,0 +1,107 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.commons.domain.lang; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.Range; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + *

+ * 实体类 + * + *

+ * + * @since 2023-12-23 + */ +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@TableName("cere_platform_lang_info") +@ApiModel(value = "CerePlatformLangInfo", description = "") +@AllArgsConstructor +public class CerePlatformLangInfo { + + private static final long serialVersionUID = 1L; + + /** + * 主键Id + */ + @ApiModelProperty(value = "主键Id") + @NotNull(message = "主键Id不能为空") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + + /** + * 多语言主键 + */ + @ApiModelProperty(value = "多语言主键") + @Length(max = 255, message = "多语言主键长度不能超过255") + @TableField(value = "lang_key", condition = LIKE) + private String langKey; + + + /** + * 多语言名字 + */ + @ApiModelProperty(value = "多语言名字") + @Length(max = 255, message = "多语言名字长度不能超过255") + @TableField(value = "lang_desc", condition = LIKE) + private String langDesc; + + + /** + * 中文 + */ + @ApiModelProperty(value = "中文") + @Length(max = 255, message = "中文长度不能超过255") + @TableField(value = "lang_zh", condition = LIKE) + private String langZh; + + + /** + * 英语 + */ + @ApiModelProperty(value = "英语") + @Length(max = 255, message = "英语长度不能超过255") + @TableField(value = "lang_en", condition = LIKE) + private String langEn; + + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private String createTime; + + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private String updateTime; + +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermission.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermission.java index 507ceb4..954dee8 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermission.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermission.java @@ -9,21 +9,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; /** * cere_platform_permission 权限实体类 @@ -107,12 +100,6 @@ public class CerePlatformPermission implements Serializable { @ApiModelProperty(value = "更新时间") private String updateTime; - /** - * 名称Json - */ - @ApiModelProperty(value = "名称Json") - private String permissionNameJson; - private static final long serialVersionUID = 1L; @@ -121,28 +108,22 @@ public class CerePlatformPermission implements Serializable { */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map permissionNameMap; + private Map langInfoMap; public void initData(){ - if(permissionNameMap == null){ - permissionNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(permissionNameMap)) { - if(StringUtils.isNotEmpty(permissionNameJson)){ - permissionNameMap = new Gson().fromJson(permissionNameJson, Map.class); - } - if(CollectionUtils.isEmpty(permissionNameMap)){ - permissionNameMap.put("zh", permissionName); + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setPermissionName(langInfoMap.get(defaultLangType).getPermissionName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setPermissionName(langInfoMap.get(LangUtil.ZH).getPermissionName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setPermissionName(langInfoMap.get(LangUtil.EN).getPermissionName()); + } else { + setPermissionName(langInfoMap.entrySet().stream().findFirst().get().getValue().getPermissionName()); } } - - if(permissionNameMap.containsKey("zh")){ - permissionName = permissionNameMap.get("zh"); - }else if(permissionNameMap.containsKey("en")){ - permissionName = permissionNameMap.get("en"); - } - } - - } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermissionLangInfo.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermissionLangInfo.java new file mode 100644 index 0000000..a764617 --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/permission/CerePlatformPermissionLangInfo.java @@ -0,0 +1,84 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.commons.domain.permission; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.Range; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + *

+ * 实体类 + * + *

+ * + * @since 2023-12-23 + */ +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@TableName("cere_platform_permission_lang_info") +@ApiModel(value = "CerePlatformPermissionLangInfo", description = "") +@AllArgsConstructor +public class CerePlatformPermissionLangInfo { + + private static final long serialVersionUID = 1L; + + /** + * 主键Id + */ + @ApiModelProperty(value = "主键Id") + @NotNull(message = "主键Id不能为空") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + + /** + * 菜单主键 + */ + @ApiModelProperty(value = "菜单主键") + @TableField("permission_id") + private Long permissionId; + + + /** + * 菜单名字 + */ + @ApiModelProperty(value = "菜单名字") + @Length(max = 255, message = "菜单名字长度不能超过255") + @TableField(value = "permission_name", condition = LIKE) + private String permissionName; + + + /** + * 语言类型 + */ + @ApiModelProperty(value = "语言类型") + @Length(max = 32, message = "语言类型长度不能超过32") + @TableField(value = "language_type", condition = LIKE) + private String languageType; + + + + +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassify.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassify.java index a7890b7..f3590d9 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassify.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassify.java @@ -9,7 +9,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.google.gson.Gson; +import com.shop.cereshop.commons.utils.EmptyUtils; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,6 +20,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * cere_product_classify 平台商品分类实体类 @@ -71,12 +74,6 @@ public class CereProductClassify implements Serializable { private String classifyName; /** - * 分类名称Json - */ - @ApiModelProperty(value = "分类名称Json") - private String classifyNameJson; - - /** * 分类图片地址 */ @ApiModelProperty(value = "分类图片地址") @@ -121,34 +118,44 @@ public class CereProductClassify implements Serializable { */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map classifyNameMap; + private Map langInfoMap; public void initData(){ - initData("zh"); + initData(LangUtil.ZH); } - public void initData(String language){ - if(classifyNameMap == null){ - classifyNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(classifyNameMap)) { - if(StringUtils.isNotEmpty(classifyNameJson)){ - classifyNameMap = new Gson().fromJson(classifyNameJson, Map.class); - } - if(CollectionUtils.isEmpty(classifyNameMap)){ - classifyNameMap.put("zh", classifyName); + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setClassifyName(langInfoMap.get(defaultLangType).getClassifyName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setClassifyName(langInfoMap.get(LangUtil.ZH).getClassifyName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setClassifyName(langInfoMap.get(LangUtil.EN).getClassifyName()); + } else { + setClassifyName(langInfoMap.entrySet().stream().findFirst().get().getValue().getClassifyName()); } + }else if(StringUtils.isNotEmpty(classifyName)){ + langInfoMap = new HashMap<>(); + CereProductClassifyLangInfo classifyLangInfo = new CereProductClassifyLangInfo(); + classifyLangInfo.setClassifyId(getClassifyId()); + classifyLangInfo.setClassifyName(getClassifyName()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); } + } - if(StringUtils.equals(language, "zh")){ - classifyName = classifyNameMap.get("zh"); - }else if(StringUtils.equals(language, "en")){ - classifyName = classifyNameMap.get("en"); - }else if(classifyNameMap.containsKey("zh")){ - classifyName = classifyNameMap.get("zh"); - }else if(classifyNameMap.containsKey("en")){ - classifyName = classifyNameMap.get("en"); - } + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getClassifyId(), getClassifyId())).collect(Collectors.toList()); + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereProductClassifyLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } } - } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassifyLangInfo.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassifyLangInfo.java new file mode 100644 index 0000000..c3e319f --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereProductClassifyLangInfo.java @@ -0,0 +1,84 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.commons.domain.product; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.Range; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + *

+ * 实体类 + * + *

+ * + * @since 2023-12-23 + */ +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@TableName("cere_product_classify_lang_info") +@ApiModel(value = "CereProductClassifyLangInfo", description = "") +@AllArgsConstructor +public class CereProductClassifyLangInfo { + + private static final long serialVersionUID = 1L; + + /** + * 主键Id + */ + @ApiModelProperty(value = "主键Id") + @NotNull(message = "主键Id不能为空") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + + /** + * 分类主键 + */ + @ApiModelProperty(value = "分类主键") + @TableField("classify_id") + private Long classifyId; + + + /** + * 分类名字 + */ + @ApiModelProperty(value = "分类名字") + @Length(max = 255, message = "分类名字长度不能超过255") + @TableField(value = "classify_name", condition = LIKE) + private String classifyName; + + + /** + * 语言类型 + */ + @ApiModelProperty(value = "语言类型") + @Length(max = 32, message = "语言类型长度不能超过32") + @TableField(value = "language_type", condition = LIKE) + private String languageType; + + + + +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProduct.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProduct.java index 82efba4..55e6b83 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProduct.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProduct.java @@ -6,11 +6,20 @@ package com.shop.cereshop.commons.domain.product; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * cere_shop_product 店铺商品信息实体类 @@ -125,4 +134,60 @@ public class CereShopProduct implements Serializable { private static final long serialVersionUID = 1L; + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setProductName(langInfoMap.get(defaultLangType).getProductName()); + setProductBrief(langInfoMap.get(defaultLangType).getProductBrief()); + setProductText(langInfoMap.get(defaultLangType).getProductText()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setProductName(langInfoMap.get(LangUtil.ZH).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.ZH).getProductBrief()); + setProductText(langInfoMap.get(LangUtil.ZH).getProductText()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setProductName(langInfoMap.get(LangUtil.EN).getProductName()); + setProductBrief(langInfoMap.get(LangUtil.EN).getProductBrief()); + setProductText(langInfoMap.get(LangUtil.EN).getProductText()); + } else { + setProductName(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductName()); + setProductBrief(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductBrief()); + setProductText(langInfoMap.entrySet().stream().findFirst().get().getValue().getProductText()); + } + }else if(StringUtils.isNotEmpty(productName)){ + langInfoMap = new HashMap<>(); + CereShopProductLangInfo classifyLangInfo = new CereShopProductLangInfo(); + classifyLangInfo.setProductId(getProductId()); + classifyLangInfo.setProductBrief(getProductBrief()); + classifyLangInfo.setProductName(getProductName()); + classifyLangInfo.setProductText(getProductText()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getProductId(), getProductId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereShopProductLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } + } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProductLangInfo.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProductLangInfo.java new file mode 100644 index 0000000..4c33717 --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereShopProductLangInfo.java @@ -0,0 +1,102 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.commons.domain.product; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.Range; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + *

+ * 实体类 + * 店铺商品信息表 + *

+ * + * @since 2024-01-07 + */ +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@TableName("cere_shop_product_lang_info") +@ApiModel(value = "CereShopProductLangInfo", description = "店铺商品信息表") +@AllArgsConstructor +public class CereShopProductLangInfo { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + + /** + * 商品id + */ + @ApiModelProperty(value = "商品id") + @TableField("product_id") + private Long productId; + + + /** + * 商品名称 + */ + @ApiModelProperty(value = "商品名称") + @Length(max = 50, message = "商品名称长度不能超过50") + @TableField(value = "product_name", condition = LIKE) + private String productName; + + + /** + * 卖点简介 + */ + @ApiModelProperty(value = "卖点简介") + @Length(max = 50, message = "卖点简介长度不能超过50") + @TableField(value = "product_brief", condition = LIKE) + private String productBrief; + + + /** + * 商品描述（富文本） + */ + @ApiModelProperty(value = "商品描述（富文本）") + + @TableField("product_text") + private String productText; + + + /** + * 语言类型 + */ + @ApiModelProperty(value = "语言类型") + @Length(max = 32, message = "语言类型长度不能超过32") + @TableField(value = "language_type", condition = LIKE) + private String languageType; + + + + +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuName.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuName.java index 5832553..1b2afdd 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuName.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuName.java @@ -5,11 +5,20 @@ */ package com.shop.cereshop.commons.domain.product; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.shop.cereshop.commons.utils.LangUtil; +import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * cere_product_sku 商品规格属性信息实体类 @@ -61,6 +70,65 @@ public class CereSkuName implements Serializable { @ApiModelProperty(value = "规格值级别") private String valueCode; + + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; + + public void initData(){ + initData(LangUtil.ZH); + } + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setSkuName(langInfoMap.get(defaultLangType).getSkuName()); + setSkuValue(langInfoMap.get(defaultLangType).getSkuValue()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setSkuName(langInfoMap.get(LangUtil.ZH).getSkuName()); + setSkuValue(langInfoMap.get(LangUtil.ZH).getSkuValue()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setSkuName(langInfoMap.get(LangUtil.EN).getSkuName()); + setSkuValue(langInfoMap.get(LangUtil.EN).getSkuValue()); + } else { + setSkuName(langInfoMap.entrySet().stream().findFirst().get().getValue().getSkuName()); + setSkuValue(langInfoMap.entrySet().stream().findFirst().get().getValue().getSkuValue()); + } + }else if(StringUtils.isNotEmpty(skuName)){ + langInfoMap = new HashMap<>(); + CereSkuNameLangInfo classifyLangInfo = new CereSkuNameLangInfo(); + classifyLangInfo.setSkuUniId(getUniId()); + classifyLangInfo.setSkuName(getSkuName()); + classifyLangInfo.setSkuValue(getSkuValue()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); + } + } + + public String getUniId(){ + return String.format("%s-%s-%s", getSkuId(),getNameCode(),getValueCode()); + } + + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> + Objects.equals(item.getSkuUniId(), getUniId())) + .collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereSkuNameLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } + } + private static final long serialVersionUID = 1L; } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuNameLangInfo.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuNameLangInfo.java new file mode 100644 index 0000000..febe03b --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/CereSkuNameLangInfo.java @@ -0,0 +1,94 @@ +/* +* Copyright (C) 2017-2021 +* All rights reserved, Designed By 深圳中科鑫智科技有限公司 +* Copyright authorization contact 18814114118 +*/ +package com.shop.cereshop.commons.domain.product; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.Range; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; + +/** + *

+ * 实体类 + * 商品规格属性信息表 + *

+ * + * @since 2024-01-11 + */ +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@TableName("cere_sku_name_lang_info") +@ApiModel(value = "CereSkuNameLangInfo", description = "商品规格属性信息表") +@AllArgsConstructor +public class CereSkuNameLangInfo { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + + /** + * 规格id-code + */ + @ApiModelProperty(value = "规格id-code") + @Length(max = 100, message = "规格id-code长度不能超过100") + @TableField(value = "sku_uni_id", condition = LIKE) + private String skuUniId; + + + /** + * 规格名 + */ + @ApiModelProperty(value = "规格名") + @Length(max = 100, message = "规格名长度不能超过100") + @TableField(value = "sku_name", condition = LIKE) + private String skuName; + + + /** + * 规格值 + */ + @ApiModelProperty(value = "规格值") + @Length(max = 100, message = "规格值长度不能超过100") + @TableField(value = "sku_value", condition = LIKE) + private String skuValue; + + + /** + * 语言类型 + */ + @ApiModelProperty(value = "语言类型") + @Length(max = 32, message = "语言类型长度不能超过32") + @TableField(value = "language_type", condition = LIKE) + private String languageType; + + + + +} diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/Classify.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/Classify.java index b24771f..54b8d02 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/Classify.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/Classify.java @@ -7,7 +7,7 @@ package com.shop.cereshop.commons.domain.product; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.google.gson.Gson; +import com.shop.cereshop.commons.utils.LangUtil; import com.shop.cereshop.commons.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,6 +16,8 @@ import lombok.Data; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 分类层级结构 @@ -62,43 +64,49 @@ public class Classify { /** - * 分类名称Json - */ - @ApiModelProperty(value = "分类名称Json") - private String classifyNameJson; - - /** * 名称Map */ @ApiModelProperty(value = "名称Map") @TableField(exist = false) - private Map classifyNameMap; + private Map langInfoMap; public void initData(){ - initData("zh"); + initData(LangUtil.ZH); } - public void initData(String language){ - if(classifyNameMap == null){ - classifyNameMap = new HashMap<>(); - } - if (CollectionUtils.isEmpty(classifyNameMap)) { - if(StringUtils.isNotEmpty(classifyNameJson)){ - classifyNameMap = new Gson().fromJson(classifyNameJson, Map.class); - } - if(CollectionUtils.isEmpty(classifyNameMap)){ - classifyNameMap.put("zh", categoryName); + public void initData(String defaultLangType){ + if(CollectionUtils.isNotEmpty(langInfoMap)) { + if (StringUtils.isNotEmpty(defaultLangType) && langInfoMap.containsKey(defaultLangType)) { + setCategoryName(langInfoMap.get(defaultLangType).getClassifyName()); + }else if (langInfoMap.containsKey(LangUtil.ZH)) { + setCategoryName(langInfoMap.get(LangUtil.ZH).getClassifyName()); + } else if (langInfoMap.containsKey(LangUtil.EN)) { + setCategoryName(langInfoMap.get(LangUtil.EN).getClassifyName()); + } else { + setCategoryName(langInfoMap.entrySet().stream().findFirst().get().getValue().getClassifyName()); } + }else if(StringUtils.isNotEmpty(categoryName)){ + langInfoMap = new HashMap<>(); + CereProductClassifyLangInfo classifyLangInfo = new CereProductClassifyLangInfo(); + classifyLangInfo.setClassifyId(getId()); + classifyLangInfo.setClassifyName(getCategoryName()); + classifyLangInfo.setLanguageType(LangUtil.ZH); + langInfoMap.put(LangUtil.ZH, classifyLangInfo); } + } - if(StringUtils.equals(language, "zh")){ - categoryName = classifyNameMap.get("zh"); - }else if(StringUtils.equals(language, "en")){ - categoryName = classifyNameMap.get("en"); - }else if(classifyNameMap.containsKey("zh")){ - categoryName = classifyNameMap.get("zh"); - }else if(classifyNameMap.containsKey("en")){ - categoryName = classifyNameMap.get("en"); - } + public void initMap(List cereProductClassifyLangInfoList){ + if (CollectionUtils.isNotEmpty(cereProductClassifyLangInfoList)) { + List productClassifyLangInfoList = + cereProductClassifyLangInfoList.stream().filter(item -> Objects.equals(item.getClassifyId(), getId())).collect(Collectors.toList()); + + Map cereProductClassifyLangInfoMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(productClassifyLangInfoList)){ + for (CereProductClassifyLangInfo cereProductClassifyLangInfo : productClassifyLangInfoList) { + cereProductClassifyLangInfoMap.put(cereProductClassifyLangInfo.getLanguageType(), cereProductClassifyLangInfo); + } + } + setLangInfoMap(cereProductClassifyLangInfoMap); + } } } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuName.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuName.java index 00904f5..94acbe6 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuName.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuName.java @@ -5,12 +5,14 @@ */ package com.shop.cereshop.commons.domain.product; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * 规格属性名数据 @@ -42,4 +44,11 @@ public class SkuName implements Serializable { */ @ApiModelProperty(value = "规格值属性数组") private List values; + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuValue.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuValue.java index cc90fc6..0c36d56 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuValue.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/product/SkuValue.java @@ -5,11 +5,13 @@ */ package com.shop.cereshop.commons.domain.product; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Map; /** * 规格属性值数据 @@ -36,4 +38,11 @@ public class SkuValue implements Serializable { */ @ApiModelProperty(value = "规格值级别") private String valueCode; + + /** + * 名称Map + */ + @ApiModelProperty(value = "名称Map") + @TableField(exist = false) + private Map langInfoMap; } diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/LangUtil.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/LangUtil.java new file mode 100644 index 0000000..31fedb5 --- /dev/null +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/LangUtil.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2017-2021 + * All rights reserved, Designed By 深圳中科鑫智科技有限公司 + * Copyright authorization contact 18814114118 + */ +package com.shop.cereshop.commons.utils; + +/** + */ +public class LangUtil { + + //中文 + public static final String ZH = "zh"; + //英文 + public static final String EN = "en"; +}