From 09a713e2e2b257fc2e8535638f1ad6619cb48c57 Mon Sep 17 00:00:00 2001 From: taochengbo <552920369@qq.com> Date: Tue, 26 May 2020 22:27:01 +0800 Subject: [PATCH] =?UTF-8?q?task--=E5=AF=BC=E5=85=A5=E5=8C=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/co/yixiang/ApiRun.java | 1 - .../common/service/impl/BaseServiceImpl.java | 3 +- .../common/web/param/OrderQueryParam.java | 1 - .../co/yixiang/config/ConfigurerAdapter.java | 13 +--- .../java/co/yixiang/config/DataScope.java | 7 --- .../co/yixiang/config/MybatisPlusConfig.java | 1 - .../listener/RedisKeyExpirationListener.java | 2 +- .../listener/RedisKeyInitialization.java | 1 + .../activity/entity/YxStoreBargain.java | 6 +- .../activity/entity/YxStoreBargainUser.java | 12 ++-- .../entity/YxStoreBargainUserHelp.java | 12 ++-- .../activity/entity/YxStoreCombination.java | 8 +-- .../modules/activity/entity/YxStorePink.java | 6 +- .../activity/entity/YxStoreSeckill.java | 8 +-- .../mapper/YxStoreBargainUserHelpMapper.java | 6 +- .../mapper/YxStoreBargainUserMapper.java | 6 +- .../activity/mapper/YxStorePinkMapper.java | 8 +-- .../activity/mapper/YxStoreSeckillMapper.java | 8 +-- .../service/YxStoreBargainService.java | 4 +- .../YxStoreBargainUserHelpService.java | 4 +- .../service/YxStoreBargainUserService.java | 4 +- .../service/YxStoreCombinationService.java | 4 +- .../activity/service/YxStorePinkService.java | 4 +- .../service/YxStoreSeckillService.java | 4 +- .../impl/YxStoreBargainServiceImpl.java | 2 - .../YxStoreBargainUserHelpServiceImpl.java | 12 ++-- .../impl/YxStoreBargainUserServiceImpl.java | 1 - .../impl/YxStoreCombinationServiceImpl.java | 2 - .../service/impl/YxStorePinkServiceImpl.java | 8 ++- .../controller/StoreBargainController.java | 15 +++-- .../StoreCombinationController.java | 13 ++-- .../controller/StoreSeckillController.java | 6 +- .../web/param/YxStoreBargainQueryParam.java | 3 +- .../YxStoreBargainUserHelpQueryParam.java | 3 +- .../param/YxStoreBargainUserQueryParam.java | 3 +- .../param/YxStoreCombinationQueryParam.java | 3 +- .../web/param/YxStorePinkQueryParam.java | 3 +- .../web/param/YxStoreSeckillQueryParam.java | 3 +- .../web/vo/YxStoreCombinationQueryVo.java | 3 +- .../manage/mapper/YxExpressMapper.java | 6 +- .../manage/service/YxExpressService.java | 4 +- .../service/impl/YxExpressServiceImpl.java | 10 ++-- .../web/controller/ShoperController.java | 7 ++- .../manage/web/param/YxExpressQueryParam.java | 3 +- .../service/impl/RedisServiceImpl.java | 1 - .../modules/notify/TencentSmsSender.java | 1 + .../modules/order/entity/YxStoreOrder.java | 1 + .../mapper/YxStoreOrderCartInfoMapper.java | 6 +- .../order/mapper/YxStoreOrderMapper.java | 10 ++-- .../mapper/YxStoreOrderStatusMapper.java | 6 +- .../order/service/YxStoreOrderService.java | 12 ++-- .../impl/YxStoreOrderCartInfoServiceImpl.java | 3 +- .../service/impl/YxStoreOrderServiceImpl.java | 45 +++++++++++--- .../impl/YxStoreOrderStatusServiceImpl.java | 2 +- .../web/controller/StoreOrderController.java | 43 +++++++++++--- .../param/YxStoreOrderCartInfoQueryParam.java | 3 +- .../web/param/YxStoreOrderQueryParam.java | 3 +- .../param/YxStoreOrderStatusQueryParam.java | 3 +- .../security/config/SecurityConfig.java | 6 +- .../modules/security/rest/AuthController.java | 8 ++- .../security/security/TokenProvider.java | 7 ++- .../modules/security/security/vo/JwtUser.java | 3 - .../security/service/OnlineUserService.java | 12 ++-- .../modules/shop/entity/YxSystemStore.java | 5 +- .../shop/entity/YxSystemStoreStaff.java | 4 +- .../modules/shop/mapper/YxArticleMapper.java | 2 +- .../shop/mapper/YxStoreCartMapper.java | 6 +- .../shop/mapper/YxStoreCategoryMapper.java | 6 +- .../mapper/YxStoreCouponIssueUserMapper.java | 6 +- .../shop/mapper/YxStoreCouponMapper.java | 6 +- .../shop/mapper/YxStoreCouponUserMapper.java | 6 +- .../shop/mapper/YxStoreProductAttrMapper.java | 6 +- .../YxStoreProductAttrResultMapper.java | 6 +- .../mapper/YxStoreProductAttrValueMapper.java | 6 +- .../shop/mapper/YxStoreProductMapper.java | 6 +- .../mapper/YxStoreProductRelationMapper.java | 6 +- .../mapper/YxStoreProductReplyMapper.java | 6 +- .../shop/mapper/YxSystemConfigMapper.java | 6 +- .../shop/mapper/YxSystemGroupDataMapper.java | 6 +- .../shop/mapper/YxSystemStoreMapper.java | 8 +-- .../shop/mapper/YxSystemStoreStaffMapper.java | 6 +- .../service/CreatShareProductService.java | 3 +- .../service/YxStoreCouponIssueService.java | 4 +- .../YxStoreCouponIssueUserService.java | 4 +- .../shop/service/YxStoreCouponService.java | 4 +- .../service/YxStoreCouponUserService.java | 4 +- .../YxStoreProductAttrResultService.java | 4 +- .../YxStoreProductAttrValueService.java | 4 +- .../YxStoreProductRelationService.java | 4 +- .../service/YxStoreProductReplyService.java | 4 +- .../shop/service/YxStoreProductService.java | 4 +- .../shop/service/YxSystemStoreService.java | 4 +- .../service/YxSystemStoreStaffService.java | 4 +- .../impl/CreatShareProductServiceImpl.java | 8 ++- .../service/impl/YxStoreCartServiceImpl.java | 7 ++- .../impl/YxStoreCouponIssueServiceImpl.java | 10 ++-- .../YxStoreCouponIssueUserServiceImpl.java | 10 ++-- .../impl/YxStoreCouponServiceImpl.java | 10 ++-- .../impl/YxStoreCouponUserServiceImpl.java | 10 ++-- .../YxStoreProductAttrResultServiceImpl.java | 10 ++-- .../impl/YxStoreProductAttrServiceImpl.java | 6 +- .../YxStoreProductAttrValueServiceImpl.java | 10 ++-- .../YxStoreProductRelationServiceImpl.java | 10 ++-- .../impl/YxStoreProductServiceImpl.java | 6 +- .../impl/YxSystemStoreServiceImpl.java | 16 ++--- .../impl/YxSystemStoreStaffServiceImpl.java | 17 +++--- .../web/controller/ArticleController.java | 5 +- .../shop/web/controller/CouponController.java | 8 ++- .../web/controller/StoreCartController.java | 7 ++- .../controller/StoreProductController.java | 19 ++++-- .../web/param/YxStoreCategoryQueryParam.java | 3 +- .../param/YxStoreCouponIssueQueryParam.java | 3 +- .../YxStoreCouponIssueUserQueryParam.java | 3 +- .../web/param/YxStoreCouponQueryParam.java | 3 +- .../param/YxStoreCouponUserQueryParam.java | 3 +- .../param/YxStoreProductAttrQueryParam.java | 3 +- .../YxStoreProductAttrResultQueryParam.java | 3 +- .../YxStoreProductAttrValueQueryParam.java | 3 +- .../web/param/YxStoreProductQueryParam.java | 3 +- .../YxStoreProductRelationQueryParam.java | 3 +- .../param/YxStoreProductReplyQueryParam.java | 3 +- .../web/param/YxSystemConfigQueryParam.java | 3 +- .../param/YxSystemGroupDataQueryParam.java | 3 +- .../web/param/YxSystemStoreQueryParam.java | 2 +- .../param/YxSystemStoreStaffQueryParam.java | 3 +- .../web/vo/YxStoreProductAttrQueryVo.java | 3 +- .../shop/web/vo/YxSystemStoreQueryVo.java | 3 +- .../web/vo/YxSystemStoreStaffQueryVo.java | 4 +- .../user/mapper/YxSystemAttachmentMapper.java | 6 +- .../user/mapper/YxSystemUserLevelMapper.java | 6 +- .../user/mapper/YxSystemUserTaskMapper.java | 6 +- .../user/mapper/YxUserAddressMapper.java | 6 +- .../modules/user/mapper/YxUserBillMapper.java | 13 ++-- .../user/mapper/YxUserExtractMapper.java | 6 +- .../user/mapper/YxUserLevelMapper.java | 8 +-- .../modules/user/mapper/YxUserMapper.java | 8 +-- .../user/mapper/YxUserRechargeMapper.java | 6 +- .../modules/user/mapper/YxUserSignMapper.java | 13 +--- .../user/mapper/YxUserTaskFinishMapper.java | 6 +- .../user/mapper/YxWechatUserMapper.java | 6 +- .../service/YxSystemAttachmentService.java | 4 +- .../service/YxSystemUserLevelService.java | 4 +- .../user/service/YxSystemUserTaskService.java | 4 +- .../user/service/YxUserAddressService.java | 4 +- .../user/service/YxUserExtractService.java | 4 +- .../user/service/YxUserLevelService.java | 4 +- .../user/service/YxUserRechargeService.java | 4 +- .../user/service/YxUserSignService.java | 4 +- .../user/service/YxUserTaskFinishService.java | 4 +- .../user/service/YxWechatUserService.java | 4 +- .../impl/YxSystemAttachmentServiceImpl.java | 10 ++-- .../impl/YxSystemUserLevelServiceImpl.java | 12 ++-- .../impl/YxUserAddressServiceImpl.java | 10 ++-- .../service/impl/YxUserBillServiceImpl.java | 18 +++--- .../impl/YxUserExtractServiceImpl.java | 10 ++-- .../service/impl/YxUserLevelServiceImpl.java | 1 - .../impl/YxUserRechargeServiceImpl.java | 6 +- .../user/service/impl/YxUserServiceImpl.java | 18 +++++- .../impl/YxUserTaskFinishServiceImpl.java | 10 ++-- .../service/impl/YxWechatUserServiceImpl.java | 10 ++-- .../web/controller/UserAddressController.java | 8 ++- .../web/controller/UserBillController.java | 14 +++-- .../user/web/controller/UserController.java | 8 ++- .../web/controller/UserLevelController.java | 2 +- .../controller/UserRechargeController.java | 3 - .../user/web/dto/BillOrderRecordDTO.java | 3 - .../modules/user/web/dto/UserLevelDTO.java | 1 - .../param/YxSystemAttachmentQueryParam.java | 3 +- .../param/YxSystemUserLevelQueryParam.java | 3 +- .../web/param/YxSystemUserTaskQueryParam.java | 3 +- .../web/param/YxUserAddressQueryParam.java | 3 +- .../user/web/param/YxUserBillQueryParam.java | 3 +- .../web/param/YxUserExtractQueryParam.java | 3 +- .../user/web/param/YxUserLevelQueryParam.java | 3 +- .../user/web/param/YxUserQueryParam.java | 3 +- .../web/param/YxUserRechargeQueryParam.java | 3 +- .../user/web/param/YxUserSignQueryParam.java | 3 +- .../web/param/YxUserTaskFinishQueryParam.java | 3 +- .../web/param/YxWechatUserQueryParam.java | 3 +- .../web/vo/YxSystemAttachmentQueryVo.java | 5 +- .../user/web/vo/YxSystemUserLevelQueryVo.java | 4 +- .../user/web/vo/YxSystemUserTaskQueryVo.java | 4 +- .../user/web/vo/YxUserAddressQueryVo.java | 4 +- .../user/web/vo/YxUserBillQueryVo.java | 4 +- .../user/web/vo/YxUserExtractQueryVo.java | 4 +- .../user/web/vo/YxUserLevelQueryVo.java | 5 +- .../modules/user/web/vo/YxUserQueryVo.java | 2 - .../user/web/vo/YxUserRechargeQueryVo.java | 4 +- .../user/web/vo/YxUserSignQueryVo.java | 4 +- .../user/web/vo/YxUserTaskFinishQueryVo.java | 5 +- .../user/web/vo/YxWechatUserQueryVo.java | 4 +- .../web/controller/WechatController.java | 8 ++- .../wechat/web/param/WxPhoneParam.java | 1 - .../java/co/yixiang/test/CodeGenerator.java | 11 +++- .../java/co/yixiang/aspect/LimitAspect.java | 5 +- .../co/yixiang/config/ElPermissionConfig.java | 1 + .../java/co/yixiang/config/RedisConfig.java | 3 +- .../java/co/yixiang/config/SwaggerConfig.java | 2 + .../dozer/config/DozerMapperConfig.java | 2 - .../java/co/yixiang/enums/OrderInfoEnum.java | 1 + .../exception/BadRequestException.java | 1 + .../handler/GlobalExceptionHandler.java | 9 ++- .../co/yixiang/print/PrintStoreOrderVO.java | 2 - .../main/java/co/yixiang/utils/CateDTO.java | 2 +- .../main/java/co/yixiang/utils/FileUtil.java | 12 +++- .../main/java/co/yixiang/utils/FontUtil.java | 3 +- .../main/java/co/yixiang/utils/OrderUtil.java | 2 - .../main/java/co/yixiang/utils/PageUtil.java | 6 +- .../java/co/yixiang/utils/RedisUtils.java | 13 +++- .../java/co/yixiang/utils/RequestHolder.java | 1 + .../java/co/yixiang/utils/TranslatorUtil.java | 1 + .../knife4j/spring/util/SwaggerUtil.java | 12 +++- .../knife4j/spring/web/Knife4jController.java | 18 +++++- .../java/co/yixiang/utils/FileUtilTest.java | 2 +- .../yixiang/gen/rest/GenConfigController.java | 9 ++- .../yixiang/gen/rest/GeneratorController.java | 14 ++++- .../yixiang/gen/service/GeneratorService.java | 2 +- .../service/impl/GenConfigServiceImpl.java | 3 +- .../service/impl/GeneratorServiceImpl.java | 9 +-- .../gen/service/mapper/ColumnInfoMapper.java | 3 +- .../gen/service/mapper/GenConfigMapper.java | 2 +- .../java/co/yixiang/gen/utils/ColUtil.java | 4 +- .../java/co/yixiang/gen/utils/GenUtil.java | 14 ++++- .../co/yixiang/logging/aspect/LogAspect.java | 2 +- .../java/co/yixiang/logging/domain/Log.java | 1 + .../yixiang/logging/rest/LogController.java | 11 +++- .../yixiang/logging/service/LogService.java | 2 +- .../logging/service/dto/LogErrorDTO.java | 1 + .../logging/service/dto/LogQueryCriteria.java | 1 + .../logging/service/dto/LogSmallDTO.java | 1 + .../logging/service/impl/LogServiceImpl.java | 8 ++- .../logging/service/mapper/LogMapper.java | 1 + .../yixiang/mp/config/WxMpConfiguration.java | 12 +++- .../controller/WechatArticleController.java | 11 +++- .../mp/controller/WechatMenuController.java | 9 +-- .../mp/controller/WechatReplyController.java | 9 +-- .../controller/WechatTemplateController.java | 12 ++-- .../java/co/yixiang/mp/domain/YxArticle.java | 9 +-- .../co/yixiang/mp/domain/YxWechatMenu.java | 9 ++- .../co/yixiang/mp/domain/YxWechatReply.java | 8 ++- .../yixiang/mp/domain/YxWechatTemplate.java | 13 ++-- .../co/yixiang/mp/handler/LogHandler.java | 1 - .../co/yixiang/mp/handler/MsgHandler.java | 1 - .../co/yixiang/mp/handler/ScanHandler.java | 7 +-- .../yixiang/mp/handler/SubscribeHandler.java | 12 ++-- .../yixiang/mp/service/YxArticleService.java | 8 ++- .../yixiang/mp/service/YxMiniPayService.java | 1 - .../co/yixiang/mp/service/YxPayService.java | 4 -- .../mp/service/YxWechatMenuService.java | 8 ++- .../mp/service/YxWechatReplyService.java | 8 ++- .../mp/service/YxWechatTemplateService.java | 8 ++- .../yixiang/mp/service/dto/YxArticleDto.java | 1 + .../service/dto/YxArticleQueryCriteria.java | 2 - .../mp/service/dto/YxWechatMenuDto.java | 1 + .../dto/YxWechatMenuQueryCriteria.java | 2 - .../mp/service/dto/YxWechatReplyDto.java | 1 + .../dto/YxWechatReplyQueryCriteria.java | 2 - .../mp/service/dto/YxWechatTemplateDto.java | 1 + .../dto/YxWechatTemplateQueryCriteria.java | 2 - .../impl/WxMpTemplateMessageServiceImpl.java | 3 - .../mp/service/impl/YxArticleServiceImpl.java | 31 +++++----- .../service/impl/YxWechatMenuServiceImpl.java | 26 ++++---- .../impl/YxWechatReplyServiceImpl.java | 28 +++++---- .../impl/YxWechatTemplateServiceImpl.java | 29 ++++----- .../yixiang/common/utils/QueryHelpPlus.java | 8 ++- .../java/co/yixiang/config/MetaHandler.java | 1 - .../activity/domain/YxStoreBargain.java | 16 +++-- .../activity/domain/YxStoreCombination.java | 17 ++++-- .../activity/domain/YxStoreCoupon.java | 8 ++- .../activity/domain/YxStoreCouponIssue.java | 8 ++- .../domain/YxStoreCouponIssueUser.java | 7 ++- .../activity/domain/YxStoreCouponUser.java | 9 ++- .../modules/activity/domain/YxStorePink.java | 9 ++- .../activity/domain/YxStoreSeckill.java | 16 +++-- .../modules/activity/domain/YxStoreVisit.java | 7 ++- .../activity/domain/YxUserExtract.java | 9 ++- .../activity/rest/StoreBargainController.java | 8 ++- .../rest/StoreCombinationController.java | 9 ++- .../activity/rest/StoreCouponController.java | 9 ++- .../rest/StoreCouponIssueController.java | 9 ++- .../rest/StoreCouponIssueUserController.java | 9 ++- .../rest/StoreCouponUserController.java | 4 +- .../activity/rest/StorePinkController.java | 4 +- .../activity/rest/StoreSeckillController.java | 8 ++- .../activity/rest/UserExtractController.java | 8 ++- .../service/YxStoreBargainService.java | 8 ++- .../service/YxStoreCombinationService.java | 8 ++- .../service/YxStoreCouponIssueService.java | 8 ++- .../YxStoreCouponIssueUserService.java | 8 ++- .../service/YxStoreCouponService.java | 8 ++- .../service/YxStoreCouponUserService.java | 8 ++- .../activity/service/YxStorePinkService.java | 8 ++- .../service/YxStoreSeckillService.java | 8 ++- .../activity/service/YxStoreVisitService.java | 8 ++- .../service/YxUserExtractService.java | 8 ++- .../service/dto/YxStoreBargainDto.java | 5 +- .../dto/YxStoreBargainQueryCriteria.java | 2 - .../service/dto/YxStoreCombinationDto.java | 4 +- .../dto/YxStoreCombinationQueryCriteria.java | 3 +- .../service/dto/YxStoreCouponDto.java | 3 +- .../service/dto/YxStoreCouponIssueDto.java | 3 +- .../dto/YxStoreCouponIssueQueryCriteria.java | 3 +- .../dto/YxStoreCouponIssueUserDto.java | 1 + .../YxStoreCouponIssueUserQueryCriteria.java | 2 - .../dto/YxStoreCouponQueryCriteria.java | 3 +- .../service/dto/YxStoreCouponUserDto.java | 3 +- .../dto/YxStoreCouponUserQueryCriteria.java | 3 +- .../activity/service/dto/YxStorePinkDto.java | 3 +- .../service/dto/YxStorePinkQueryCriteria.java | 3 +- .../service/dto/YxStoreSeckillDto.java | 4 +- .../dto/YxStoreSeckillQueryCriteria.java | 3 +- .../activity/service/dto/YxStoreVisitDto.java | 1 + .../dto/YxStoreVisitQueryCriteria.java | 2 - .../service/dto/YxUserExtractDto.java | 3 +- .../dto/YxUserExtractQueryCriteria.java | 3 +- .../impl/YxStoreBargainServiceImpl.java | 29 +++++---- .../impl/YxStoreCombinationServiceImpl.java | 37 ++++++------ .../impl/YxStoreCouponIssueServiceImpl.java | 29 +++++---- .../YxStoreCouponIssueUserServiceImpl.java | 29 +++++---- .../impl/YxStoreCouponServiceImpl.java | 29 +++++---- .../impl/YxStoreCouponUserServiceImpl.java | 35 ++++++----- .../service/impl/YxStorePinkServiceImpl.java | 29 +++++---- .../impl/YxStoreSeckillServiceImpl.java | 30 +++++----- .../service/impl/YxStoreVisitServiceImpl.java | 29 +++++---- .../impl/YxUserExtractServiceImpl.java | 29 +++++---- .../modules/shop/domain/YxExpress.java | 6 +- .../modules/shop/domain/YxMaterial.java | 13 +++- .../modules/shop/domain/YxMaterialGroup.java | 13 +++- .../modules/shop/domain/YxStoreCart.java | 7 ++- .../modules/shop/domain/YxStoreCategory.java | 6 +- .../modules/shop/domain/YxStoreOrder.java | 10 +++- .../shop/domain/YxStoreOrderCartInfo.java | 6 +- .../shop/domain/YxStoreOrderStatus.java | 7 ++- .../modules/shop/domain/YxStoreProduct.java | 10 ++-- .../shop/domain/YxStoreProductAttr.java | 7 ++- .../shop/domain/YxStoreProductAttrResult.java | 7 ++- .../shop/domain/YxStoreProductAttrValue.java | 10 ++-- .../shop/domain/YxStoreProductReply.java | 8 ++- .../modules/shop/domain/YxSystemConfig.java | 7 ++- .../shop/domain/YxSystemGroupData.java | 7 ++- .../modules/shop/domain/YxSystemStore.java | 8 ++- .../shop/domain/YxSystemStoreStaff.java | 8 ++- .../shop/domain/YxSystemUserLevel.java | 10 +++- .../modules/shop/domain/YxSystemUserTask.java | 9 ++- .../yixiang/modules/shop/domain/YxUser.java | 11 +++- .../modules/shop/domain/YxUserBill.java | 11 +++- .../modules/shop/domain/YxUserRecharge.java | 11 +++- .../modules/shop/domain/YxWechatUser.java | 8 ++- .../modules/shop/rest/ExpressController.java | 9 ++- .../modules/shop/rest/MaterialController.java | 9 ++- .../shop/rest/MaterialGroupController.java | 9 ++- .../modules/shop/rest/MemberController.java | 9 ++- .../shop/rest/StoreCategoryController.java | 11 +++- .../shop/rest/StoreOrderController.java | 27 +++++++-- .../shop/rest/StoreProductController.java | 11 +++- .../rest/StoreProductReplyController.java | 8 ++- .../shop/rest/SystemConfigController.java | 6 +- .../shop/rest/SystemGroupDataController.java | 11 +++- .../shop/rest/SystemStoreController.java | 8 ++- .../shop/rest/SystemStoreStaffController.java | 10 +++- .../shop/rest/SystemUserLevelController.java | 9 ++- .../shop/rest/SystemUserTaskController.java | 9 ++- .../shop/rest/UserRechargeController.java | 9 ++- .../shop/rest/YxWechatUserController.java | 21 +++++-- .../shop/service/YxExpressService.java | 8 ++- .../shop/service/YxMaterialGroupService.java | 8 ++- .../shop/service/YxMaterialService.java | 8 ++- .../shop/service/YxStoreCartService.java | 8 ++- .../shop/service/YxStoreCategoryService.java | 8 ++- .../service/YxStoreOrderCartInfoService.java | 8 ++- .../shop/service/YxStoreOrderService.java | 8 ++- .../service/YxStoreOrderStatusService.java | 8 ++- .../YxStoreProductAttrResultService.java | 6 +- .../service/YxStoreProductAttrService.java | 6 +- .../YxStoreProductAttrValueService.java | 6 +- .../service/YxStoreProductReplyService.java | 8 ++- .../shop/service/YxStoreProductService.java | 8 ++- .../shop/service/YxSystemConfigService.java | 8 ++- .../service/YxSystemGroupDataService.java | 8 ++- .../shop/service/YxSystemStoreService.java | 8 ++- .../service/YxSystemStoreStaffService.java | 8 ++- .../service/YxSystemUserLevelService.java | 8 ++- .../shop/service/YxSystemUserTaskService.java | 8 ++- .../shop/service/YxUserBillService.java | 8 ++- .../shop/service/YxUserRechargeService.java | 8 ++- .../modules/shop/service/YxUserService.java | 8 ++- .../shop/service/YxWechatUserService.java | 8 ++- .../shop/service/dto/UserMoneyDto.java | 1 - .../shop/service/dto/YxExpressDto.java | 1 + .../service/dto/YxExpressQueryCriteria.java | 2 - .../shop/service/dto/YxMaterialDto.java | 3 +- .../shop/service/dto/YxMaterialGroupDto.java | 3 +- .../dto/YxMaterialGroupQueryCriteria.java | 2 - .../service/dto/YxMaterialQueryCriteria.java | 3 +- .../shop/service/dto/YxStoreCartDto.java | 1 + .../service/dto/YxStoreCartQueryCriteria.java | 2 - .../shop/service/dto/YxStoreCategoryDto.java | 1 + .../dto/YxStoreCategoryQueryCriteria.java | 2 - .../service/dto/YxStoreCategorySmallDto.java | 2 - .../service/dto/YxStoreOrderCartInfoDto.java | 1 + .../YxStoreOrderCartInfoQueryCriteria.java | 2 - .../shop/service/dto/YxStoreOrderDto.java | 3 +- .../dto/YxStoreOrderQueryCriteria.java | 5 +- .../service/dto/YxStoreOrderStatusDto.java | 1 + .../dto/YxStoreOrderStatusQueryCriteria.java | 2 - .../shop/service/dto/YxStoreProductDto.java | 3 +- .../dto/YxStoreProductQueryCriteria.java | 3 +- .../service/dto/YxStoreProductReplyDto.java | 1 + .../dto/YxStoreProductReplyQueryCriteria.java | 3 +- .../service/dto/YxStoreProductSmallDto.java | 1 - .../shop/service/dto/YxSystemConfigDto.java | 1 + .../dto/YxSystemConfigQueryCriteria.java | 2 - .../service/dto/YxSystemGroupDataDto.java | 1 + .../dto/YxSystemGroupDataQueryCriteria.java | 2 +- .../shop/service/dto/YxSystemStoreDto.java | 1 + .../dto/YxSystemStoreQueryCriteria.java | 2 - .../service/dto/YxSystemStoreStaffDto.java | 1 + .../dto/YxSystemStoreStaffQueryCriteria.java | 3 +- .../service/dto/YxSystemUserLevelDto.java | 3 +- .../dto/YxSystemUserLevelQueryCriteria.java | 2 - .../shop/service/dto/YxSystemUserTaskDto.java | 1 + .../dto/YxSystemUserTaskQueryCriteria.java | 2 - .../shop/service/dto/YxUserBillDto.java | 3 +- .../service/dto/YxUserBillQueryCriteria.java | 2 - .../modules/shop/service/dto/YxUserDto.java | 3 +- .../shop/service/dto/YxUserQueryCriteria.java | 3 +- .../shop/service/dto/YxUserRechargeDto.java | 3 +- .../dto/YxUserRechargeQueryCriteria.java | 3 +- .../shop/service/dto/YxUserSmallDto.java | 1 - .../shop/service/dto/YxWechatUserDto.java | 3 +- .../dto/YxWechatUserQueryCriteria.java | 2 - .../service/impl/YxExpressServiceImpl.java | 27 +++++---- .../impl/YxMaterialGroupServiceImpl.java | 27 +++++---- .../service/impl/YxMaterialServiceImpl.java | 27 +++++---- .../service/impl/YxStoreCartServiceImpl.java | 29 ++++----- .../impl/YxStoreCategoryServiceImpl.java | 31 ++++++---- .../impl/YxStoreOrderCartInfoServiceImpl.java | 27 +++++---- .../service/impl/YxStoreOrderServiceImpl.java | 54 ++++++++++++----- .../impl/YxStoreOrderStatusServiceImpl.java | 27 +++++---- .../YxStoreProductAttrResultServiceImpl.java | 4 +- .../impl/YxStoreProductAttrServiceImpl.java | 4 +- .../YxStoreProductAttrValueServiceImpl.java | 4 +- .../impl/YxStoreProductReplyServiceImpl.java | 36 ++++++----- .../impl/YxStoreProductServiceImpl.java | 46 ++++++++++----- .../impl/YxSystemConfigServiceImpl.java | 29 ++++----- .../impl/YxSystemGroupDataServiceImpl.java | 29 ++++----- .../impl/YxSystemStoreServiceImpl.java | 27 +++++---- .../impl/YxSystemStoreStaffServiceImpl.java | 27 +++++---- .../impl/YxSystemUserLevelServiceImpl.java | 27 +++++---- .../service/impl/YxUserBillServiceImpl.java | 27 ++++----- .../impl/YxUserRechargeServiceImpl.java | 27 +++++---- .../shop/service/impl/YxUserServiceImpl.java | 35 +++++------ .../service/impl/YxWechatUserServiceImpl.java | 27 +++++---- .../service/mapper/StoreProductMapper.java | 1 - .../shop/service/mapper/UserBillMapper.java | 3 - .../src/main/java/co/yixiang/AppRun.java | 2 +- .../java/co/yixiang/config/DataScope.java | 7 ++- .../co/yixiang/config/MybatisPlusConfig.java | 1 - .../config/thread/AsyncTaskExecutePool.java | 1 + .../modules/monitor/domain/Visits.java | 1 + .../modules/monitor/rest/RedisController.java | 6 +- .../modules/quartz/domain/QuartzJob.java | 8 ++- .../modules/quartz/domain/QuartzLog.java | 8 ++- .../quartz/rest/QuartzJobController.java | 11 +++- .../quartz/service/QuartzJobService.java | 8 ++- .../quartz/service/QuartzLogService.java | 8 ++- .../quartz/service/dto/QuartzJobDto.java | 3 +- .../service/dto/QuartzJobQueryCriteria.java | 2 +- .../quartz/service/dto/QuartzLogDto.java | 3 +- .../service/dto/QuartzLogQueryCriteria.java | 2 - .../service/impl/QuartzJobServiceImpl.java | 30 +++++----- .../service/impl/QuartzLogServiceImpl.java | 26 ++++---- .../modules/quartz/utils/ExecutionJob.java | 8 ++- .../modules/quartz/utils/QuartzManage.java | 12 +++- .../modules/quartz/utils/QuartzRunnable.java | 1 + .../security/config/SecurityProperties.java | 1 - .../modules/security/rest/AuthController.java | 18 ++++-- .../security/rest/OnlineController.java | 8 ++- .../security/security/TokenFilter.java | 5 +- .../security/security/TokenProvider.java | 10 +++- .../modules/security/security/vo/JwtUser.java | 1 + .../security/service/OnlineUserService.java | 17 ++++-- .../service/UserDetailsServiceImpl.java | 7 ++- .../yixiang/modules/system/domain/Dept.java | 11 +++- .../yixiang/modules/system/domain/Dict.java | 11 ++-- .../modules/system/domain/DictDetail.java | 12 ++-- .../co/yixiang/modules/system/domain/Job.java | 11 ++-- .../yixiang/modules/system/domain/Menu.java | 15 +++-- .../yixiang/modules/system/domain/Role.java | 14 +++-- .../modules/system/domain/RolesDepts.java | 6 +- .../modules/system/domain/RolesMenus.java | 6 +- .../yixiang/modules/system/domain/User.java | 11 ++-- .../modules/system/domain/UserAvatar.java | 13 ++-- .../modules/system/domain/UsersRoles.java | 6 +- .../modules/system/domain/vo/MenuMetaVo.java | 1 + .../modules/system/rest/DeptController.java | 12 ++-- .../modules/system/rest/DictController.java | 12 +++- .../system/rest/DictDetailController.java | 11 +++- .../modules/system/rest/JobController.java | 11 +++- .../modules/system/rest/MenuController.java | 13 ++-- .../modules/system/rest/RoleController.java | 12 +++- .../system/rest/SysUserController.java | 16 +++-- .../modules/system/service/DeptService.java | 10 ++-- .../system/service/DictDetailService.java | 8 ++- .../modules/system/service/DictService.java | 8 ++- .../modules/system/service/JobService.java | 8 ++- .../modules/system/service/MenuService.java | 10 ++-- .../modules/system/service/RoleService.java | 11 ++-- .../system/service/UserAvatarService.java | 8 ++- .../modules/system/service/UserService.java | 9 +-- .../modules/system/service/dto/DeptDto.java | 3 +- .../system/service/dto/DeptQueryCriteria.java | 3 +- .../system/service/dto/DeptSmallDto.java | 1 + .../system/service/dto/DictDetailDto.java | 3 +- .../service/dto/DictDetailQueryCriteria.java | 2 +- .../modules/system/service/dto/DictDto.java | 3 +- .../system/service/dto/DictQueryCriteria.java | 3 +- .../system/service/dto/DictSmallDto.java | 1 + .../modules/system/service/dto/JobDto.java | 3 +- .../system/service/dto/JobQueryCriteria.java | 3 +- .../system/service/dto/JobSmallDto.java | 1 + .../modules/system/service/dto/MenuDto.java | 3 +- .../system/service/dto/MenuQueryCriteria.java | 2 - .../modules/system/service/dto/RoleDto.java | 3 +- .../system/service/dto/RoleQueryCriteria.java | 2 - .../system/service/dto/RoleSmallDto.java | 1 + .../system/service/dto/UserAvatarDto.java | 3 +- .../service/dto/UserAvatarQueryCriteria.java | 2 - .../modules/system/service/dto/UserDto.java | 4 +- .../system/service/dto/UserQueryCriteria.java | 3 +- .../system/service/impl/DeptServiceImpl.java | 40 ++++++------- .../service/impl/DictDetailServiceImpl.java | 28 ++++----- .../system/service/impl/DictServiceImpl.java | 29 +++++---- .../system/service/impl/JobServiceImpl.java | 31 +++++----- .../system/service/impl/MenuServiceImpl.java | 49 +++++++-------- .../system/service/impl/RoleServiceImpl.java | 59 ++++++++++--------- .../service/impl/RolesDeptsServiceImpl.java | 4 +- .../service/impl/RolesMenusServiceImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 46 ++++++++------- .../service/impl/UserAvatarServiceImpl.java | 29 +++++---- .../service/impl/UsersRolesServiceImpl.java | 4 +- .../system/service/mapper/DeptMapper.java | 1 - .../service/mapper/DictDetailMapper.java | 1 - .../system/service/mapper/SysUserMapper.java | 2 - .../test/java/co/yixiang/Api_java_demo.java | 8 ++- .../src/test/java/co/yixiang/PrintUtil4.java | 16 ++--- .../yixiang/tools/config/MultipartConfig.java | 1 + .../co/yixiang/tools/domain/AlipayConfig.java | 6 +- .../co/yixiang/tools/domain/EmailConfig.java | 5 +- .../co/yixiang/tools/domain/LocalStorage.java | 12 ++-- .../java/co/yixiang/tools/domain/Picture.java | 11 ++-- .../co/yixiang/tools/domain/QiniuConfig.java | 6 +- .../co/yixiang/tools/domain/QiniuContent.java | 11 ++-- .../tools/domain/VerificationCode.java | 1 + .../yixiang/tools/rest/AliPayController.java | 16 +++-- .../yixiang/tools/rest/EmailController.java | 11 +++- .../tools/rest/LocalStorageController.java | 22 ++++--- .../yixiang/tools/rest/PictureController.java | 17 ++++-- .../yixiang/tools/rest/QiniuController.java | 10 +++- .../yixiang/tools/rest/UploadController.java | 5 +- .../rest/VerificationCodeController.java | 13 ++-- .../tools/service/AlipayConfigService.java | 3 +- .../tools/service/EmailConfigService.java | 3 +- .../tools/service/LocalStorageService.java | 9 +-- .../yixiang/tools/service/PictureService.java | 9 +-- .../tools/service/QiniuConfigService.java | 8 ++- .../tools/service/QiniuContentService.java | 10 ++-- .../tools/service/dto/LocalStorageDto.java | 3 +- .../dto/LocalStorageQueryCriteria.java | 2 +- .../yixiang/tools/service/dto/PictureDto.java | 3 +- .../service/dto/PictureQueryCriteria.java | 2 - .../tools/service/dto/QiniuConfigDto.java | 1 + .../service/dto/QiniuConfigQueryCriteria.java | 2 - .../tools/service/dto/QiniuContentDto.java | 3 +- .../dto/QiniuContentQueryCriteria.java | 2 - .../tools/service/dto/QiniuQueryCriteria.java | 2 +- .../service/impl/AlipayConfigServiceImpl.java | 4 +- .../service/impl/EmailConfigServiceImpl.java | 8 +-- .../service/impl/LocalStorageServiceImpl.java | 33 ++++++----- .../service/impl/PictureServiceImpl.java | 29 +++++---- .../tools/service/impl/QiNiuServiceImpl.java | 12 ++-- .../service/impl/QiniuConfigServiceImpl.java | 31 +++++----- .../service/impl/QiniuContentServiceImpl.java | 31 +++++----- .../impl/VerificationCodeServiceImpl.java | 9 ++- .../service/mapper/EmailConfigMapper.java | 2 +- .../service/mapper/LocalStorageMapper.java | 2 +- .../co/yixiang/tools/utils/AlipayUtils.java | 1 + 587 files changed, 2749 insertions(+), 2021 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/ApiRun.java b/yshop-api/src/main/java/co/yixiang/ApiRun.java index dc927b97..efb5800f 100644 --- a/yshop-api/src/main/java/co/yixiang/ApiRun.java +++ b/yshop-api/src/main/java/co/yixiang/ApiRun.java @@ -6,7 +6,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java b/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java index abe25f04..8487ac99 100644 --- a/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/common/service/impl/BaseServiceImpl.java @@ -2,13 +2,12 @@ package co.yixiang.common.service.impl; import cn.hutool.core.collection.CollectionUtil; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.param.OrderQueryParam; import co.yixiang.common.web.param.QueryParam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import co.yixiang.common.web.param.OrderQueryParam; - import java.util.Arrays; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/common/web/param/OrderQueryParam.java b/yshop-api/src/main/java/co/yixiang/common/web/param/OrderQueryParam.java index 847743ce..b3a26266 100644 --- a/yshop-api/src/main/java/co/yixiang/common/web/param/OrderQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/common/web/param/OrderQueryParam.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Arrays; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/config/ConfigurerAdapter.java b/yshop-api/src/main/java/co/yixiang/config/ConfigurerAdapter.java index 7bfe3713..fd3146a3 100644 --- a/yshop-api/src/main/java/co/yixiang/config/ConfigurerAdapter.java +++ b/yshop-api/src/main/java/co/yixiang/config/ConfigurerAdapter.java @@ -3,19 +3,12 @@ package co.yixiang.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.format.FormatterRegistry; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.validation.MessageCodesResolver; -import org.springframework.validation.Validator; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.method.support.HandlerMethodReturnValueHandler; -import org.springframework.web.servlet.HandlerExceptionResolver; -import org.springframework.web.servlet.config.annotation.*; - -import java.util.List; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * WebMvcConfigurer diff --git a/yshop-api/src/main/java/co/yixiang/config/DataScope.java b/yshop-api/src/main/java/co/yixiang/config/DataScope.java index 32a74056..45521e9f 100644 --- a/yshop-api/src/main/java/co/yixiang/config/DataScope.java +++ b/yshop-api/src/main/java/co/yixiang/config/DataScope.java @@ -1,15 +1,8 @@ package co.yixiang.config; -import co.yixiang.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * 数据权限配置 * @author hupeng diff --git a/yshop-api/src/main/java/co/yixiang/config/MybatisPlusConfig.java b/yshop-api/src/main/java/co/yixiang/config/MybatisPlusConfig.java index 2f458f9d..4e2a1130 100644 --- a/yshop-api/src/main/java/co/yixiang/config/MybatisPlusConfig.java +++ b/yshop-api/src/main/java/co/yixiang/config/MybatisPlusConfig.java @@ -2,7 +2,6 @@ package co.yixiang.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java index 0e0acbcd..69ba9bf5 100644 --- a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java +++ b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyExpirationListener.java @@ -9,8 +9,8 @@ package co.yixiang.listener; import cn.hutool.core.util.StrUtil; -import co.yixiang.constant.ShopConstants; import co.yixiang.config.RedisConfigProperties; +import co.yixiang.constant.ShopConstants; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.order.entity.YxStoreOrder; diff --git a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java index 53dd6cb7..e8f63461 100644 --- a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java +++ b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; + import javax.annotation.PostConstruct; import java.util.List; import java.util.stream.Collectors; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargain.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargain.java index ffd7197b..76d7702b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargain.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargain.java @@ -1,16 +1,14 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +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 lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUser.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUser.java index 9e9dd60f..7d7ce598 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUser.java @@ -1,15 +1,17 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUserHelp.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUserHelp.java index 65e98a7d..2661c1ea 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUserHelp.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreBargainUserHelp.java @@ -1,15 +1,17 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreCombination.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreCombination.java index 308003a9..97362f67 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreCombination.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreCombination.java @@ -1,18 +1,14 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; - -import java.util.Date; - +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 lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStorePink.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStorePink.java index 30764450..4337c908 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStorePink.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStorePink.java @@ -1,16 +1,14 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +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 lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreSeckill.java b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreSeckill.java index 06efda5f..ca44fe3a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreSeckill.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/entity/YxStoreSeckill.java @@ -1,18 +1,14 @@ package co.yixiang.modules.activity.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; - -import java.util.Date; - +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 lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserHelpMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserHelpMapper.java index bc2448b2..a070e35c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserHelpMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserHelpMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.activity.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.web.param.YxStoreBargainUserHelpQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserHelpQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserMapper.java index a3d0692b..dc2a3a3b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainUserMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.activity.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.web.param.YxStoreBargainUserQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStorePinkMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStorePinkMapper.java index 6e59e0df..2aa9f887 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStorePinkMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStorePinkMapper.java @@ -1,12 +1,12 @@ package co.yixiang.modules.activity.mapper; -import co.yixiang.modules.activity.web.dto.PinkDTO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStorePink; +import co.yixiang.modules.activity.web.dto.PinkDTO; import co.yixiang.modules.activity.web.param.YxStorePinkQueryParam; import co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreSeckillMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreSeckillMapper.java index 48934df8..f5ba0994 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreSeckillMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreSeckillMapper.java @@ -1,12 +1,12 @@ package co.yixiang.modules.activity.mapper; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStoreSeckill; import co.yixiang.modules.activity.web.param.YxStoreSeckillQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreSeckillQueryVo; +import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java index d0109c5d..e3a2cdf7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java @@ -8,14 +8,14 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.modules.activity.web.dto.BargainCountDTO; import co.yixiang.modules.activity.web.dto.BargainDTO; import co.yixiang.modules.activity.web.dto.TopCountDTO; import co.yixiang.modules.activity.web.param.YxStoreBargainQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java index 61c78356..15dec475 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.web.param.YxStoreBargainUserHelpQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserHelpQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserService.java index 821bb055..a3e4e328 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.web.param.YxStoreBargainUserQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java index b5675367..dd2bfe2b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.modules.activity.web.dto.StoreCombinationDTO; import co.yixiang.modules.activity.web.param.YxStoreCombinationQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java index 80fcd6cd..6966d412 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java @@ -8,13 +8,13 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.web.dto.PinkDTO; import co.yixiang.modules.activity.web.dto.PinkInfoDTO; import co.yixiang.modules.activity.web.param.YxStorePinkQueryParam; import co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java index 54b6bd42..fe949777 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.activity.service; -import co.yixiang.modules.activity.entity.YxStoreSeckill; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.activity.entity.YxStoreSeckill; import co.yixiang.modules.activity.web.dto.StoreSeckillDTO; import co.yixiang.modules.activity.web.param.YxStoreSeckillQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreSeckillQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 25173dd6..06b098e5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -34,8 +34,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.AllArgsConstructor; -import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserHelpServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserHelpServiceImpl.java index 1dca8791..0a3d178f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserHelpServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserHelpServiceImpl.java @@ -9,6 +9,8 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.mapper.YxStoreBargainUserHelpMapper; @@ -17,21 +19,17 @@ import co.yixiang.modules.activity.service.YxStoreBargainUserHelpService; import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.web.param.YxStoreBargainUserHelpQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserHelpQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import lombok.Setter; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java index 8c82c054..f652e2c7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java @@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 2c27b1a6..5a651f88 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -25,8 +25,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.AllArgsConstructor; -import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index cf9c6aad..f0aba925 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -39,8 +39,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.AllArgsConstructor; -import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -48,7 +46,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index ee3e9b18..9a0cace1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -16,11 +16,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.http.HttpUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.service.YxStoreBargainService; @@ -35,7 +35,6 @@ import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.service.YxSystemAttachmentService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.vo.YxUserQueryVo; -import co.yixiang.mp.config.ShopKeyUtils; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -47,9 +46,15 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +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 java.awt.*; +import java.awt.Color; +import java.awt.Font; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index cb86c46b..53eb3815 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -15,11 +15,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.http.HttpUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -42,9 +42,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; -import java.awt.*; +import java.awt.Color; +import java.awt.Font; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java index e1706c4f..a88d74f1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.activity.web.controller; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.common.api.ApiResult; @@ -34,7 +33,10 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java index 33230922..83290802 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 砍价表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java index f1e1d715..bb58a4c6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserHelpQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 砍价用户帮助表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java index 446bba95..0fc26737 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreBargainUserQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户参与砍价表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java index 8f831f72..8544815f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreCombinationQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 拼团产品表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java index 4d1d0d38..e29d6ff5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStorePinkQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 拼团表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java index 5d7f276f..ee004c32 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/param/YxStoreSeckillQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.activity.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品秒杀产品表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreCombinationQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreCombinationQueryVo.java index 52a10f3c..07eb34c8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreCombinationQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreCombinationQueryVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -103,4 +102,4 @@ public class YxStoreCombinationQueryVo implements Serializable { private Date startTimeDate; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/mapper/YxExpressMapper.java b/yshop-api/src/main/java/co/yixiang/modules/manage/mapper/YxExpressMapper.java index bd8b33d9..259b263b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/mapper/YxExpressMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/mapper/YxExpressMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.manage.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.manage.entity.YxExpress; import co.yixiang.modules.manage.web.param.YxExpressQueryParam; import co.yixiang.modules.manage.web.vo.YxExpressQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/service/YxExpressService.java b/yshop-api/src/main/java/co/yixiang/modules/manage/service/YxExpressService.java index b15c5381..65741cc2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/service/YxExpressService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/service/YxExpressService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.manage.service; -import co.yixiang.modules.manage.entity.YxExpress; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.manage.entity.YxExpress; import co.yixiang.modules.manage.web.param.YxExpressQueryParam; import co.yixiang.modules.manage.web.vo.YxExpressQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java index a9a132a2..688d4970 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/service/impl/YxExpressServiceImpl.java @@ -8,21 +8,21 @@ */ package co.yixiang.modules.manage.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.manage.entity.YxExpress; import co.yixiang.modules.manage.mapper.YxExpressMapper; import co.yixiang.modules.manage.service.YxExpressService; import co.yixiang.modules.manage.web.param.YxExpressQueryParam; import co.yixiang.modules.manage.web.vo.YxExpressQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java index 8aac2ab9..61259d5b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java @@ -22,14 +22,17 @@ import co.yixiang.modules.manage.web.param.ShoperQueryParam; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.dto.OrderCountDTO; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; -import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; 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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import java.util.LinkedHashMap; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/YxExpressQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/YxExpressQueryParam.java index f9352c1c..6cd50e1a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/YxExpressQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/YxExpressQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.manage.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 快递公司表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java index 59cbbe74..f2d39749 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java @@ -11,7 +11,6 @@ package co.yixiang.modules.monitor.service.impl; import co.yixiang.modules.monitor.domain.vo.RedisVo; import co.yixiang.modules.monitor.service.RedisService; import co.yixiang.utils.PageUtil; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/yshop-api/src/main/java/co/yixiang/modules/notify/TencentSmsSender.java b/yshop-api/src/main/java/co/yixiang/modules/notify/TencentSmsSender.java index 6df21137..5764f416 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/notify/TencentSmsSender.java +++ b/yshop-api/src/main/java/co/yixiang/modules/notify/TencentSmsSender.java @@ -5,6 +5,7 @@ import com.github.qcloudsms.SmsSingleSenderResult; import com.github.qcloudsms.httpclient.HTTPException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import java.io.IOException; /* diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java index 75b90fe2..fefdf6de 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; + import java.math.BigDecimal; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderCartInfoMapper.java b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderCartInfoMapper.java index a8dca048..e718c1b4 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderCartInfoMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderCartInfoMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.order.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.order.entity.YxStoreOrderCartInfo; import co.yixiang.modules.order.web.param.YxStoreOrderCartInfoQueryParam; import co.yixiang.modules.order.web.vo.YxStoreOrderCartInfoQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderMapper.java b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderMapper.java index 6aef7b1f..d2d2eba1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderMapper.java @@ -2,14 +2,14 @@ package co.yixiang.modules.order.mapper; import co.yixiang.modules.manage.web.dto.ChartDataDTO; import co.yixiang.modules.manage.web.dto.OrderDataDTO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.order.entity.YxStoreOrder; import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderStatusMapper.java b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderStatusMapper.java index 13ee4685..872330a6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderStatusMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/mapper/YxStoreOrderStatusMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.order.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.order.entity.YxStoreOrderStatus; import co.yixiang.modules.order.web.param.YxStoreOrderStatusQueryParam; import co.yixiang.modules.order.web.vo.YxStoreOrderStatusQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java index 762dfe27..40301527 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java @@ -8,27 +8,29 @@ */ package co.yixiang.modules.order.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.manage.web.dto.OrderDataDTO; import co.yixiang.modules.manage.web.dto.OrderTimeDataDTO; import co.yixiang.modules.manage.web.param.OrderDeliveryParam; import co.yixiang.modules.manage.web.param.OrderPriceParam; import co.yixiang.modules.manage.web.param.OrderRefundParam; import co.yixiang.modules.order.entity.YxStoreOrder; -import co.yixiang.common.service.BaseService; -import co.yixiang.modules.order.web.dto.*; +import co.yixiang.modules.order.web.dto.CacheDTO; +import co.yixiang.modules.order.web.dto.ComputeDTO; +import co.yixiang.modules.order.web.dto.OrderCountDTO; +import co.yixiang.modules.order.web.dto.OtherDTO; +import co.yixiang.modules.order.web.dto.PriceGroupDTO; import co.yixiang.modules.order.web.param.OrderParam; import co.yixiang.modules.order.web.param.RefundParam; import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult; import com.github.binarywang.wxpay.exception.WxPayException; - - import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java index 007c3321..417f26c1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -9,10 +9,10 @@ package co.yixiang.modules.order.service.impl; import cn.hutool.core.util.IdUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.order.entity.YxStoreOrderCartInfo; import co.yixiang.modules.order.mapper.YxStoreOrderCartInfoMapper; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; -import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,7 +21,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.ArrayList; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index d6398b0c..6334690c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -17,11 +17,18 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.enums.*; +import co.yixiang.enums.AppFromEnum; +import co.yixiang.enums.BillDetailEnum; +import co.yixiang.enums.BillEnum; +import co.yixiang.enums.OrderCountEnum; +import co.yixiang.enums.OrderInfoEnum; +import co.yixiang.enums.OrderStatusEnum; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.activity.service.*; +import co.yixiang.modules.activity.service.YxStoreBargainService; +import co.yixiang.modules.activity.service.YxStoreBargainUserService; +import co.yixiang.modules.activity.service.YxStoreCombinationService; +import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.manage.service.YxExpressService; import co.yixiang.modules.manage.web.dto.ChartDataDTO; import co.yixiang.modules.manage.web.dto.OrderDataDTO; @@ -38,7 +45,12 @@ import co.yixiang.modules.order.mapping.OrderMap; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; -import co.yixiang.modules.order.web.dto.*; +import co.yixiang.modules.order.web.dto.CacheDTO; +import co.yixiang.modules.order.web.dto.ComputeDTO; +import co.yixiang.modules.order.web.dto.OrderCountDTO; +import co.yixiang.modules.order.web.dto.OtherDTO; +import co.yixiang.modules.order.web.dto.PriceGroupDTO; +import co.yixiang.modules.order.web.dto.StatusDTO; import co.yixiang.modules.order.web.param.OrderParam; import co.yixiang.modules.order.web.param.RefundParam; import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam; @@ -47,19 +59,29 @@ import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.mapper.YxStoreCartMapper; import co.yixiang.modules.shop.mapper.YxStoreCouponUserMapper; -import co.yixiang.modules.shop.service.*; +import co.yixiang.modules.shop.service.YxStoreCouponUserService; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.YxSystemConfigService; +import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxWechatUser; -import co.yixiang.modules.user.service.*; +import co.yixiang.modules.user.service.YxUserAddressService; +import co.yixiang.modules.user.service.YxUserBillService; +import co.yixiang.modules.user.service.YxUserLevelService; +import co.yixiang.modules.user.service.YxUserService; +import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; +import co.yixiang.mp.service.YxMiniPayService; import co.yixiang.mp.service.YxPayService; import co.yixiang.mp.service.YxTemplateService; -import co.yixiang.mp.service.YxMiniPayService; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.domain.vo.TradeVo; import co.yixiang.tools.service.AlipayConfigService; import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; @@ -80,7 +102,12 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; //import co.yixiang.common.rocketmq.MqProducer; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderStatusServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderStatusServiceImpl.java index 5df2e677..fe2be87e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderStatusServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderStatusServiceImpl.java @@ -8,10 +8,10 @@ */ package co.yixiang.modules.order.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.order.entity.YxStoreOrderStatus; import co.yixiang.modules.order.mapper.YxStoreOrderStatusMapper; import co.yixiang.modules.order.service.YxStoreOrderStatusService; -import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.utils.OrderUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java index e7b802b3..dd3a7ca9 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java @@ -13,15 +13,13 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.enums.PayTypeEnum; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.tools.express.ExpressService; -import co.yixiang.tools.express.dao.ExpressInfo; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -31,16 +29,35 @@ import co.yixiang.modules.order.entity.YxStoreOrderCartInfo; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; -import co.yixiang.modules.order.web.dto.*; -import co.yixiang.modules.order.web.param.*; +import co.yixiang.modules.order.web.dto.ComputeDTO; +import co.yixiang.modules.order.web.dto.ConfirmOrderDTO; +import co.yixiang.modules.order.web.dto.OrderCartInfoDTO; +import co.yixiang.modules.order.web.dto.OrderExtendDTO; +import co.yixiang.modules.order.web.dto.OtherDTO; +import co.yixiang.modules.order.web.dto.PriceGroupDTO; +import co.yixiang.modules.order.web.dto.ProductAttrDTO; +import co.yixiang.modules.order.web.dto.ProductDTO; +import co.yixiang.modules.order.web.param.ExpressParam; +import co.yixiang.modules.order.web.param.OrderParam; +import co.yixiang.modules.order.web.param.OrderVerifyParam; +import co.yixiang.modules.order.web.param.PayParam; +import co.yixiang.modules.order.web.param.RefundParam; +import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import co.yixiang.modules.shop.entity.YxStoreProductReply; -import co.yixiang.modules.shop.service.*; +import co.yixiang.modules.shop.service.YxStoreCartService; +import co.yixiang.modules.shop.service.YxStoreCouponUserService; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxSystemConfigService; +import co.yixiang.modules.shop.service.YxSystemStoreService; +import co.yixiang.modules.shop.service.YxSystemStoreStaffService; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.service.YxSystemAttachmentService; import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.service.YxUserService; +import co.yixiang.tools.express.ExpressService; +import co.yixiang.tools.express.dao.ExpressInfo; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.SecurityUtils; @@ -57,11 +74,19 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderCartInfoQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderCartInfoQueryParam.java index c15f330d..1a8bc954 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderCartInfoQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderCartInfoQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.order.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 订单购物详情表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java index d369c6fd..361c0929 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.order.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 订单表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderStatusQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderStatusQueryParam.java index 2233cd81..b2fe93bc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderStatusQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/YxStoreOrderStatusQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.order.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 订单操作记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java b/yshop-api/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java index 6b927b04..8a97a22e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java @@ -24,7 +24,11 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author hupeng diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java index dca1f7a8..70166a8c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -13,10 +13,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.AppFromEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.notify.NotifyService; import co.yixiang.modules.notify.NotifyType; import co.yixiang.modules.notify.SmsResult; @@ -52,7 +52,11 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/security/TokenProvider.java b/yshop-api/src/main/java/co/yixiang/modules/security/security/TokenProvider.java index 8a0aa9b8..ccc39873 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/security/TokenProvider.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/security/TokenProvider.java @@ -1,7 +1,12 @@ package co.yixiang.modules.security.security; import co.yixiang.modules.security.config.SecurityProperties; -import io.jsonwebtoken.*; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java b/yshop-api/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java index f7f24c45..71334136 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java @@ -3,13 +3,10 @@ package co.yixiang.modules.security.security.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NoArgsConstructor; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import java.sql.Timestamp; import java.util.Collection; -import java.util.Date; import java.util.stream.Collectors; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java b/yshop-api/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java index 85dced35..a11f9dc5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java @@ -11,15 +11,17 @@ package co.yixiang.modules.security.service; import co.yixiang.modules.security.config.SecurityProperties; import co.yixiang.modules.security.security.vo.JwtUser; import co.yixiang.modules.security.security.vo.OnlineUser; -import co.yixiang.utils.*; +import co.yixiang.utils.EncryptUtils; +import co.yixiang.utils.RedisUtils; +import co.yixiang.utils.StringUtils; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; /** * @author hupeng diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java index 3a1f819a..3659fbc2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java @@ -1,10 +1,7 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; - -import java.util.Date; - +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStoreStaff.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStoreStaff.java index f0e46c8c..3709695b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStoreStaff.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStoreStaff.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +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 lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 门店店员表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxArticleMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxArticleMapper.java index fe73991c..6adf1f1f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxArticleMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxArticleMapper.java @@ -3,9 +3,9 @@ package co.yixiang.modules.shop.mapper; import co.yixiang.modules.shop.entity.YxArticle; import co.yixiang.modules.shop.web.param.YxArticleQueryParam; import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCartMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCartMapper.java index 0fa1fdfb..a032fbf8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCartMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCartMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCategoryMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCategoryMapper.java index a769b686..80738343 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCategoryMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCategoryMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.web.param.YxStoreCategoryQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCategoryQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueUserMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueUserMapper.java index 4ec47ac1..5b66f557 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueUserMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueUserMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCouponIssueUser; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueUserQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponMapper.java index 47957360..9d918103 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCoupon; import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponUserMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponUserMapper.java index 8c3e770f..e37783ca 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponUserMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponUserMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.web.param.YxStoreCouponUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponUserQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrMapper.java index 62259a4f..bd900bbd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProductAttr; import co.yixiang.modules.shop.web.param.YxStoreProductAttrQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrResultMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrResultMapper.java index 1d89922f..8230f0ec 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrResultMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrResultMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProductAttrResult; import co.yixiang.modules.shop.web.param.YxStoreProductAttrResultQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrResultQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java index b58c2e8a..d09bfda6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductAttrValueMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.web.param.YxStoreProductAttrValueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductMapper.java index 776ecf2f..433adad7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductRelationMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductRelationMapper.java index 6637aacc..1fccb01d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductRelationMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductRelationMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProductRelation; import co.yixiang.modules.shop.web.param.YxStoreProductRelationQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductRelationQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java index eb584668..f446d3b5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.modules.shop.web.param.YxStoreProductReplyQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemConfigMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemConfigMapper.java index 4ddfdb1a..05e5c7be 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemConfigMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemConfigMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxSystemConfig; import co.yixiang.modules.shop.web.param.YxSystemConfigQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemConfigQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemGroupDataMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemGroupDataMapper.java index 43abf594..a1249df3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemGroupDataMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemGroupDataMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxSystemGroupData; import co.yixiang.modules.shop.web.param.YxSystemGroupDataQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemGroupDataQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java index 7c3ca758..6bf47f8a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java @@ -1,14 +1,12 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxSystemStore; import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreStaffMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreStaffMapper.java index 67603f17..4caaa117 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreStaffMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreStaffMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxSystemStoreStaff; import co.yixiang.modules.shop.web.param.YxSystemStoreStaffQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreStaffQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/CreatShareProductService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/CreatShareProductService.java index a66a65f3..207acd4c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/CreatShareProductService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/CreatShareProductService.java @@ -1,9 +1,8 @@ package co.yixiang.modules.shop.service; import co.yixiang.modules.shop.entity.YxStoreProduct; -import co.yixiang.modules.shop.web.dto.ProductDTO; -import java.awt.*; +import java.awt.FontFormatException; import java.io.IOException; public interface CreatShareProductService { diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueService.java index 85eb96b1..3f45c95d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCouponIssue; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreCouponIssue; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueUserService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueUserService.java index 2047fbbd..aa67a1de 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponIssueUserService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCouponIssueUser; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreCouponIssueUser; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueUserQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponService.java index dafecd98..8b0281d9 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCoupon; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreCoupon; import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java index 601b9a8d..b8d0c2d1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.web.param.YxStoreCouponUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponUserQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java index 468b7884..16550c3e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProductAttrResult; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreProductAttrResult; import co.yixiang.modules.shop.web.param.YxStoreProductAttrResultQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrResultQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java index c79cc9a3..ffe9fbee 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.web.param.YxStoreProductAttrValueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductRelationService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductRelationService.java index e015d7f8..9de68570 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductRelationService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductRelationService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProductRelation; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreProductRelation; import co.yixiang.modules.shop.web.param.YxStoreProductRelationQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductRelationQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java index 33e43cf3..56814b9c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.modules.shop.web.dto.ReplyCountDTO; import co.yixiang.modules.shop.web.param.YxStoreProductReplyQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java index ea891751..91fe9198 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java index dc1dfb09..52a689d0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxSystemStore; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxSystemStore; import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java index 09a88130..af268985 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxSystemStoreStaff; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxSystemStoreStaff; import co.yixiang.modules.shop.web.param.YxSystemStoreStaffQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreStaffQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/CreatShareProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/CreatShareProductServiceImpl.java index d74d05bd..5bace73c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/CreatShareProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/CreatShareProductServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.service.CreatShareProductService; -import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.service.YxSystemAttachmentService; import lombok.RequiredArgsConstructor; @@ -14,13 +13,16 @@ import org.springframework.stereotype.Service; import javax.imageio.ImageIO; import javax.imageio.stream.ImageInputStream; -import java.awt.*; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.Graphics; +import java.awt.Image; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.UUID; @Service @RequiredArgsConstructor(onConstructor = @__(@Autowired)) diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java index e8d39d5a..20671e48 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -35,7 +35,6 @@ import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +42,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java index 85fe4784..016c10d0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueServiceImpl.java @@ -9,6 +9,8 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.entity.YxStoreCouponIssue; import co.yixiang.modules.shop.entity.YxStoreCouponIssueUser; @@ -19,17 +21,15 @@ import co.yixiang.modules.shop.service.YxStoreCouponIssueUserService; import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java index 61879956..a50c6551 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponIssueUserServiceImpl.java @@ -8,22 +8,22 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxStoreCouponIssueUser; import co.yixiang.modules.shop.mapper.YxStoreCouponIssueUserMapper; import co.yixiang.modules.shop.service.YxStoreCouponIssueUserService; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueUserQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java index cc60ba45..b5c961db 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponServiceImpl.java @@ -8,21 +8,21 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxStoreCoupon; import co.yixiang.modules.shop.mapper.YxStoreCouponMapper; import co.yixiang.modules.shop.service.YxStoreCouponService; import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java index 65e1afd7..5b7f9594 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java @@ -9,6 +9,8 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.mapper.YxStoreCouponUserMapper; @@ -18,18 +20,16 @@ import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.web.param.YxStoreCouponUserQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreCouponUserQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java index 1e3e7aa6..38fe31dc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java @@ -8,21 +8,21 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxStoreProductAttrResult; import co.yixiang.modules.shop.mapper.YxStoreProductAttrResultMapper; import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; import co.yixiang.modules.shop.web.param.YxStoreProductAttrResultQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrResultQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java index 9198112b..cc9640b7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java @@ -23,7 +23,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java index 6a282ea8..333fbe56 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java @@ -8,21 +8,21 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; import co.yixiang.modules.shop.web.param.YxStoreProductAttrValueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrValueQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java index ccc11a91..3a64d374 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductRelationServiceImpl.java @@ -9,24 +9,24 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.entity.YxStoreProductRelation; import co.yixiang.modules.shop.mapper.YxStoreProductRelationMapper; import co.yixiang.modules.shop.service.YxStoreProductRelationService; import co.yixiang.modules.shop.web.param.YxStoreProductRelationQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductRelationQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index cb2f0645..ba795a79 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -20,7 +20,11 @@ import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.mapper.YxStoreProductMapper; import co.yixiang.modules.shop.mapping.YxStoreProductMap; -import co.yixiang.modules.shop.service.*; +import co.yixiang.modules.shop.service.YxStoreProductAttrService; +import co.yixiang.modules.shop.service.YxStoreProductRelationService; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 7985ec02..0749479e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -10,6 +10,8 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.enums.CommonEnum; import co.yixiang.modules.shop.entity.YxSystemStore; import co.yixiang.modules.shop.mapper.YxSystemStoreMapper; @@ -17,20 +19,18 @@ import co.yixiang.modules.shop.mapping.SystemStoreMap; import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.mp.config.ShopKeyUtils; import co.yixiang.utils.LocationUtils; import co.yixiang.utils.RedisUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java index b395ed68..fb2eac69 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java @@ -8,23 +8,22 @@ */ package co.yixiang.modules.shop.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.entity.YxSystemStoreStaff; import co.yixiang.modules.shop.mapper.YxSystemStoreStaffMapper; import co.yixiang.modules.shop.service.YxSystemStoreStaffService; import co.yixiang.modules.shop.web.param.YxSystemStoreStaffQueryParam; import co.yixiang.modules.shop.web.vo.YxSystemStoreStaffQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.user.entity.YxUserRecharge; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java index 685d2778..5b8565e0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java @@ -20,7 +20,10 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java index 6ccb690d..43b4ef17 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java @@ -9,10 +9,10 @@ package co.yixiang.modules.shop.web.controller; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.enums.CouponEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.service.YxStoreCouponIssueService; import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.web.param.YxStoreCouponQueryParam; @@ -25,7 +25,11 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java index 40b2dc6c..870eedde 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java @@ -9,9 +9,9 @@ package co.yixiang.modules.shop.web.controller; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.service.YxStoreCartService; import co.yixiang.modules.shop.web.param.CartIdsParm; import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; @@ -24,7 +24,10 @@ import lombok.RequiredArgsConstructor; 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.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import java.util.LinkedHashMap; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index 6c36c4fc..4173a2a0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -13,14 +13,18 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.ProductEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.entity.YxStoreProduct; -import co.yixiang.modules.shop.service.*; +import co.yixiang.modules.shop.service.CreatShareProductService; +import co.yixiang.modules.shop.service.YxStoreProductRelationService; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.param.YxStoreProductRelationQueryParam; @@ -37,9 +41,14 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.awt.*; +import java.awt.FontFormatException; import java.io.File; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCategoryQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCategoryQueryParam.java index 4d810d5e..68fc3694 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCategoryQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCategoryQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品分类表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueQueryParam.java index 66f28898..fb9ba2b1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 优惠券前台领取表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueUserQueryParam.java index 28b34ad0..e10ce11d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponIssueUserQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 优惠券前台用户领取记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponQueryParam.java index d1db2ad3..7bdbdbe5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 优惠券表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponUserQueryParam.java index 380fd644..18b0a2d6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCouponUserQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 优惠券发放记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrQueryParam.java index 104ed406..dce99904 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品属性表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrResultQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrResultQueryParam.java index 1d2083e4..7390c202 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrResultQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrResultQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品属性详情表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrValueQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrValueQueryParam.java index dd46928d..99e8309b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrValueQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductAttrValueQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品属性值表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java index 6f693dd6..28087f14 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 商品表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductRelationQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductRelationQueryParam.java index 8385712e..78762491 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductRelationQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductRelationQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - import javax.validation.constraints.NotBlank; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductReplyQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductReplyQueryParam.java index abe0b862..a35a9c0c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductReplyQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductReplyQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 评论表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemConfigQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemConfigQueryParam.java index 2209ef13..25f86ea2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemConfigQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemConfigQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 配置表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemGroupDataQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemGroupDataQueryParam.java index 863f3494..26e637f3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemGroupDataQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemGroupDataQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 组合数据详情表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java index 5b98c392..da5a4b22 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java @@ -1,9 +1,9 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; /** *

* 门店自提 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreStaffQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreStaffQueryParam.java index 0d193bee..1d3bfef1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreStaffQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreStaffQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.shop.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 门店店员表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrQueryVo.java index 4116236c..1ee1b397 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrQueryVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.util.List; /** @@ -37,4 +36,4 @@ public class YxStoreProductAttrQueryVo implements Serializable { private List attrValueArr; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java index 5f57b40b..1844ff03 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.util.Date; /** @@ -72,4 +71,4 @@ public class YxSystemStoreQueryVo implements Serializable { private String distance; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreStaffQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreStaffQueryVo.java index 5a59d607..e2c85b51 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreStaffQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreStaffQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 门店店员表 查询结果对象 @@ -51,4 +49,4 @@ public class YxSystemStoreStaffQueryVo implements Serializable { @ApiModelProperty(value = "添加时间") private Integer addTime; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemAttachmentMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemAttachmentMapper.java index ac69b817..3e981f79 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemAttachmentMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemAttachmentMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.web.param.YxSystemAttachmentQueryParam; import co.yixiang.modules.user.web.vo.YxSystemAttachmentQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserLevelMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserLevelMapper.java index 06a331da..7b2ff6a5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserLevelMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserLevelMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxSystemUserLevel; import co.yixiang.modules.user.web.param.YxSystemUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserTaskMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserTaskMapper.java index a649f21e..bf44f12f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserTaskMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxSystemUserTaskMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxSystemUserTask; import co.yixiang.modules.user.web.param.YxSystemUserTaskQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserTaskQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserAddressMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserAddressMapper.java index 296f013e..8244a992 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserAddressMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserAddressMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.modules.user.web.param.YxUserAddressQueryParam; import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserBillMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserBillMapper.java index 82b4c51e..35391963 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserBillMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserBillMapper.java @@ -1,14 +1,17 @@ package co.yixiang.modules.user.mapper; -import co.yixiang.modules.user.web.dto.*; +import co.yixiang.modules.user.entity.YxUserBill; +import co.yixiang.modules.user.web.dto.BillDTO; +import co.yixiang.modules.user.web.dto.BillOrderRecordDTO; +import co.yixiang.modules.user.web.dto.SignDTO; +import co.yixiang.modules.user.web.dto.UserBillDTO; +import co.yixiang.modules.user.web.param.YxUserBillQueryParam; +import co.yixiang.modules.user.web.vo.YxUserBillQueryVo; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import co.yixiang.modules.user.entity.YxUserBill; -import co.yixiang.modules.user.web.param.YxUserBillQueryParam; -import co.yixiang.modules.user.web.vo.YxUserBillQueryVo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserExtractMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserExtractMapper.java index fc429ccc..e6a0519d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserExtractMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserExtractMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserExtract; import co.yixiang.modules.user.web.param.YxUserExtractQueryParam; import co.yixiang.modules.user.web.vo.YxUserExtractQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserLevelMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserLevelMapper.java index 0d69f789..5f4bba73 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserLevelMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserLevelMapper.java @@ -1,12 +1,12 @@ package co.yixiang.modules.user.mapper; -import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserLevel; +import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; import co.yixiang.modules.user.web.param.YxUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxUserLevelQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserMapper.java index 6b9f117d..3c8b1d36 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserMapper.java @@ -1,12 +1,12 @@ package co.yixiang.modules.user.mapper; -import co.yixiang.modules.user.web.dto.PromUserDTO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUser; +import co.yixiang.modules.user.web.dto.PromUserDTO; import co.yixiang.modules.user.web.param.YxUserQueryParam; import co.yixiang.modules.user.web.vo.YxUserQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserRechargeMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserRechargeMapper.java index 11768f66..2f2238b3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserRechargeMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserRechargeMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.modules.user.web.param.YxUserRechargeQueryParam; import co.yixiang.modules.user.web.vo.YxUserRechargeQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserSignMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserSignMapper.java index b0bd64e7..78214f9d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserSignMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserSignMapper.java @@ -1,22 +1,15 @@ package co.yixiang.modules.user.mapper; -import co.yixiang.modules.user.entity.YxUserBill; -import co.yixiang.modules.user.web.dto.BillDTO; -import co.yixiang.modules.user.web.dto.SignDTO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserSign; import co.yixiang.modules.user.web.param.YxUserSignQueryParam; import co.yixiang.modules.user.web.vo.YxUserSignQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.io.Serializable; -import java.util.List; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserTaskFinishMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserTaskFinishMapper.java index c1d3dbc2..744e251e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserTaskFinishMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxUserTaskFinishMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxUserTaskFinish; import co.yixiang.modules.user.web.param.YxUserTaskFinishQueryParam; import co.yixiang.modules.user.web.vo.YxUserTaskFinishQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxWechatUserMapper.java b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxWechatUserMapper.java index b6559af5..850b1003 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxWechatUserMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/mapper/YxWechatUserMapper.java @@ -1,11 +1,11 @@ package co.yixiang.modules.user.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.web.param.YxWechatUserQueryParam; import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemAttachmentService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemAttachmentService.java index 190a89cc..1d228120 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemAttachmentService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemAttachmentService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.web.param.YxSystemAttachmentQueryParam; import co.yixiang.modules.user.web.vo.YxSystemAttachmentQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java index 8f5ccb26..841b24d1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxSystemUserLevel; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxSystemUserLevel; import co.yixiang.modules.user.web.dto.UserLevelDTO; import co.yixiang.modules.user.web.param.YxSystemUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java index 27a549c7..0410eb58 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java @@ -8,13 +8,13 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxSystemUserTask; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxSystemUserTask; import co.yixiang.modules.user.web.dto.TaskDTO; import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; import co.yixiang.modules.user.web.param.YxSystemUserTaskQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserTaskQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserAddressService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserAddressService.java index c8e58387..92360d7f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserAddressService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserAddressService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.modules.user.web.param.YxUserAddressQueryParam; import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserExtractService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserExtractService.java index fcdc4ae7..6a7bf037 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserExtractService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserExtractService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserExtract; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserExtract; import co.yixiang.modules.user.web.param.UserExtParam; import co.yixiang.modules.user.web.param.YxUserExtractQueryParam; import co.yixiang.modules.user.web.vo.YxUserExtractQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java index a3fead10..d08eef66 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserLevel; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserLevel; import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; import co.yixiang.modules.user.web.param.YxUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxUserLevelQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserRechargeService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserRechargeService.java index 28d88887..adb4d94c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserRechargeService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserRechargeService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.modules.user.web.param.RechargeParam; import co.yixiang.modules.user.web.param.YxUserRechargeQueryParam; import co.yixiang.modules.user.web.vo.YxUserRechargeQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserSignService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserSignService.java index 40e1b001..21454e29 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserSignService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserSignService.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserSign; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserSign; import co.yixiang.modules.user.web.dto.SignDTO; import co.yixiang.modules.user.web.param.YxUserSignQueryParam; import co.yixiang.modules.user.web.vo.YxUserSignQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserTaskFinishService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserTaskFinishService.java index 363f97cf..8c147f9d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserTaskFinishService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserTaskFinishService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserTaskFinish; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserTaskFinish; import co.yixiang.modules.user.web.param.YxUserTaskFinishQueryParam; import co.yixiang.modules.user.web.vo.YxUserTaskFinishQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxWechatUserService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxWechatUserService.java index 556035fd..26fec541 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxWechatUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxWechatUserService.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.web.param.YxWechatUserQueryParam; import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java index f9cc33d2..0455e3db 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemAttachmentServiceImpl.java @@ -8,23 +8,23 @@ */ package co.yixiang.modules.user.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.mapper.YxSystemAttachmentMapper; import co.yixiang.modules.user.service.YxSystemAttachmentService; import co.yixiang.modules.user.web.param.YxSystemAttachmentQueryParam; import co.yixiang.modules.user.web.vo.YxSystemAttachmentQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java index a4e5bee0..2293f5c7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java @@ -9,6 +9,8 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxSystemUserLevel; import co.yixiang.modules.user.entity.YxUserLevel; import co.yixiang.modules.user.mapper.YxSystemUserLevelMapper; @@ -21,19 +23,15 @@ import co.yixiang.modules.user.web.dto.UserLevelDTO; import co.yixiang.modules.user.web.dto.UserLevelInfoDTO; import co.yixiang.modules.user.web.param.YxSystemUserLevelQueryParam; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import lombok.Setter; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index 3d9f4813..ed1702c1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -8,22 +8,22 @@ */ package co.yixiang.modules.user.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.modules.user.mapper.YxUserAddressMapper; import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.web.param.YxUserAddressQueryParam; import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java index a2f64342..233b9b96 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java @@ -8,10 +8,10 @@ */ package co.yixiang.modules.user.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.enums.BillDetailEnum; -import co.yixiang.enums.BillEnum; import co.yixiang.enums.BillInfoEnum; -import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.mapper.YxUserBillMapper; import co.yixiang.modules.user.mapping.BiillMap; @@ -21,20 +21,22 @@ import co.yixiang.modules.user.web.dto.BillOrderDTO; import co.yixiang.modules.user.web.dto.BillOrderRecordDTO; import co.yixiang.modules.user.web.param.YxUserBillQueryParam; import co.yixiang.modules.user.web.vo.YxUserBillQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java index f1df5b77..0ebe04c4 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java @@ -10,6 +10,8 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.enums.BillEnum; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.user.entity.YxUser; @@ -22,18 +24,16 @@ import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.param.UserExtParam; import co.yixiang.modules.user.web.param.YxUserExtractQueryParam; import co.yixiang.modules.user.web.vo.YxUserExtractQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.OrderUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.math.BigDecimal; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java index c28c5489..2246f066 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java @@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java index c4c81170..5c8716a7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java @@ -13,7 +13,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; -import co.yixiang.enums.*; +import co.yixiang.enums.BillDetailEnum; +import co.yixiang.enums.BillEnum; +import co.yixiang.enums.OrderInfoEnum; +import co.yixiang.enums.PayTypeEnum; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxUserRecharge; @@ -34,7 +37,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index 134fe8ae..e647a6ae 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -32,9 +32,17 @@ import co.yixiang.modules.security.service.OnlineUserService; import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.YxSystemStoreStaffService; -import co.yixiang.modules.user.entity.*; +import co.yixiang.modules.user.entity.YxSystemUserLevel; +import co.yixiang.modules.user.entity.YxUser; +import co.yixiang.modules.user.entity.YxUserBill; +import co.yixiang.modules.user.entity.YxUserLevel; +import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.mapper.YxUserMapper; -import co.yixiang.modules.user.service.*; +import co.yixiang.modules.user.service.YxSystemUserLevelService; +import co.yixiang.modules.user.service.YxUserBillService; +import co.yixiang.modules.user.service.YxUserLevelService; +import co.yixiang.modules.user.service.YxUserService; +import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.dto.PromUserDTO; import co.yixiang.modules.user.web.param.PromParam; import co.yixiang.modules.user.web.param.YxUserQueryParam; @@ -66,7 +74,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.io.Serializable; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java index d7e62edb..0ceb67bc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserTaskFinishServiceImpl.java @@ -8,23 +8,23 @@ */ package co.yixiang.modules.user.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxUserTaskFinish; import co.yixiang.modules.user.mapper.YxUserTaskFinishMapper; import co.yixiang.modules.user.service.YxUserTaskFinishService; import co.yixiang.modules.user.web.param.YxUserTaskFinishQueryParam; import co.yixiang.modules.user.web.vo.YxUserTaskFinishQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java index 87acb6b3..6b2b8ca8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxWechatUserServiceImpl.java @@ -8,22 +8,22 @@ */ package co.yixiang.modules.user.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.mapper.YxWechatUserMapper; import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.param.YxWechatUserQueryParam; import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java index ce001e9b..aa0742ae 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java @@ -9,11 +9,11 @@ package co.yixiang.modules.user.web.controller; import cn.hutool.core.util.StrUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.common.web.param.IdParam; import co.yixiang.common.web.vo.Paging; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.web.param.AddressParam; @@ -27,7 +27,11 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.LinkedHashMap; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index f936a865..5172626a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -14,11 +14,11 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; -import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.service.YxSystemAttachmentService; @@ -39,10 +39,16 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.awt.*; +import java.awt.Color; +import java.awt.Font; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java index 2fa79488..fae4ef05 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java @@ -9,10 +9,10 @@ package co.yixiang.modules.user.web.controller; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.constant.ShopConstants; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.shop.service.YxStoreProductRelationService; import co.yixiang.modules.shop.service.YxSystemGroupDataService; @@ -34,7 +34,11 @@ import lombok.RequiredArgsConstructor; 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.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.LinkedHashMap; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java index a1de8786..2a63bdff 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java @@ -8,9 +8,9 @@ */ package co.yixiang.modules.user.web.controller; -import co.yixiang.logging.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxSystemUserTaskService; import co.yixiang.modules.user.service.YxUserLevelService; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java index 802422fd..8ae7942d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.web.controller; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.common.api.ApiResult; @@ -20,10 +19,8 @@ import co.yixiang.enums.BillDetailEnum; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.YxSystemGroupDataService; -import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.service.YxUserRechargeService; -import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.param.RechargeParam; import co.yixiang.mp.service.YxPayService; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/BillOrderRecordDTO.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/BillOrderRecordDTO.java index 92655fe1..b79d7dba 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/BillOrderRecordDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/BillOrderRecordDTO.java @@ -1,10 +1,7 @@ package co.yixiang.modules.user.web.dto; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import java.util.List; - /** * @ClassName BillDTO * @Author hupeng <610796224@qq.com> diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/UserLevelDTO.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/UserLevelDTO.java index 1cee3554..a13004fe 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/UserLevelDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/dto/UserLevelDTO.java @@ -1,6 +1,5 @@ package co.yixiang.modules.user.web.dto; -import co.yixiang.modules.user.entity.YxSystemUserLevel; import co.yixiang.modules.user.web.vo.YxSystemUserLevelQueryVo; import lombok.Data; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemAttachmentQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemAttachmentQueryParam.java index b04b6bd4..36834a31 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemAttachmentQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemAttachmentQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 附件管理表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserLevelQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserLevelQueryParam.java index e8b6dc97..409b890e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserLevelQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserLevelQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 设置用户等级表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserTaskQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserTaskQueryParam.java index 1a544030..098734a9 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserTaskQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxSystemUserTaskQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 等级任务设置 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserAddressQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserAddressQueryParam.java index e998e014..6115fa58 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserAddressQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserAddressQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户地址表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserBillQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserBillQueryParam.java index e5329cb6..5b175d08 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserBillQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserBillQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户账单表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserExtractQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserExtractQueryParam.java index dedc3592..8f263495 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserExtractQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserExtractQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户提现表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserLevelQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserLevelQueryParam.java index ca8e2ad2..fb94edcc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserLevelQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserLevelQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户等级记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserQueryParam.java index 3b47ddce..18c56358 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserRechargeQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserRechargeQueryParam.java index f489d567..8f416cef 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserRechargeQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserRechargeQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户充值表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserSignQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserSignQueryParam.java index 16d3f649..ab081aa9 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserSignQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserSignQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 签到记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserTaskFinishQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserTaskFinishQueryParam.java index e613a5fe..d2d42727 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserTaskFinishQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxUserTaskFinishQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 用户任务完成记录表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxWechatUserQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxWechatUserQueryParam.java index 22f4f3fc..99bfc681 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxWechatUserQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/param/YxWechatUserQueryParam.java @@ -1,11 +1,10 @@ package co.yixiang.modules.user.web.param; +import co.yixiang.common.web.param.QueryParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import co.yixiang.common.web.param.QueryParam; - /** *

* 微信用户表 查询参数对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemAttachmentQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemAttachmentQueryVo.java index 06f96143..34b99812 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemAttachmentQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemAttachmentQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.user.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

@@ -49,4 +48,4 @@ private Boolean imageType; @ApiModelProperty(value = "图片上传模块类型 1 后台上传 2 用户生成") private Boolean moduleType; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserLevelQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserLevelQueryVo.java index 42541368..20ae7cab 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserLevelQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserLevelQueryVo.java @@ -6,9 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

@@ -64,4 +62,4 @@ public class YxSystemUserLevelQueryVo implements Serializable { -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserTaskQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserTaskQueryVo.java index b204aa19..7b42ab91 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserTaskQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxSystemUserTaskQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 等级任务设置 查询结果对象 @@ -61,4 +59,4 @@ public class YxSystemUserTaskQueryVo implements Serializable { private String taskTypeTitle;//任务类型标题 -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserAddressQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserAddressQueryVo.java index 8333e5a7..058e90df 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserAddressQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserAddressQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 用户地址表 查询结果对象 @@ -63,4 +61,4 @@ public class YxUserAddressQueryVo implements Serializable { @ApiModelProperty(value = "添加时间") private Integer addTime; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserBillQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserBillQueryVo.java index e3a6deac..ce326f24 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserBillQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserBillQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

@@ -45,4 +43,4 @@ public class YxUserBillQueryVo implements Serializable { -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserExtractQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserExtractQueryVo.java index 5e13ab9d..a12cca73 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserExtractQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserExtractQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

@@ -62,4 +60,4 @@ public class YxUserExtractQueryVo implements Serializable { @ApiModelProperty(value = "微信号") private String wechat; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserLevelQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserLevelQueryVo.java index 12f49458..40176283 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserLevelQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserLevelQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.user.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

@@ -58,4 +57,4 @@ private Integer addTime; @ApiModelProperty(value = "享受折扣") private Integer discount; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserQueryVo.java index d756bbcc..65b8a0da 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserQueryVo.java @@ -7,9 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserRechargeQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserRechargeQueryVo.java index 69b47aa7..21e90df0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserRechargeQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserRechargeQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

@@ -48,4 +46,4 @@ public class YxUserRechargeQueryVo implements Serializable { @ApiModelProperty(value = "退款金额") private BigDecimal refundPrice; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserSignQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserSignQueryVo.java index 6a77673b..c436a160 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserSignQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserSignQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 签到记录表 查询结果对象 @@ -38,4 +36,4 @@ public class YxUserSignQueryVo implements Serializable { @ApiModelProperty(value = "添加时间") private Integer addTime; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserTaskFinishQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserTaskFinishQueryVo.java index 8b5d390e..56c0437b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserTaskFinishQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserTaskFinishQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.user.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

@@ -34,4 +33,4 @@ private Boolean status; @ApiModelProperty(value = "添加时间") private Integer addTime; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxWechatUserQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxWechatUserQueryVo.java index 9e82f71b..4dd4d3fb 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxWechatUserQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxWechatUserQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

@@ -94,4 +92,4 @@ public class YxWechatUserQueryVo implements Serializable { @ApiModelProperty(value = "用户类型") private String userType; -} \ No newline at end of file +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index 56febd92..cbe2e642 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -8,7 +8,6 @@ */ package co.yixiang.modules.wechat.web.controller; -import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; @@ -23,7 +22,6 @@ import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.modules.user.service.YxUserRechargeService; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.config.WxPayConfiguration; -import co.yixiang.utils.RedisUtil; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult; @@ -39,7 +37,11 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/param/WxPhoneParam.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/param/WxPhoneParam.java index 33a5dd5b..cb78a17d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/param/WxPhoneParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/param/WxPhoneParam.java @@ -1,6 +1,5 @@ package co.yixiang.modules.wechat.web.param; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java b/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java index cf0d1750..1ef2dd26 100644 --- a/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java +++ b/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java @@ -6,7 +6,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.InjectionConfig; -import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.DataSourceConfig; +import com.baomidou.mybatisplus.generator.config.FileOutConfig; +import com.baomidou.mybatisplus.generator.config.GlobalConfig; +import com.baomidou.mybatisplus.generator.config.PackageConfig; +import com.baomidou.mybatisplus.generator.config.StrategyConfig; +import com.baomidou.mybatisplus.generator.config.TemplateConfig; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; @@ -153,8 +158,8 @@ public class CodeGenerator { return projectPath + "/yshop-api/src/main/java/"+ PROJECT_PACKAGE_PATH +"/modules/" + pc.getModuleName() + "/web/vo/" + tableInfo.getEntityName() + "QueryVo" + StringPool.DOT_JAVA; } }); - - + + cfg.setFileOutConfigList(focList); mpg.setCfg(cfg); mpg.setTemplate(new TemplateConfig().setXml(null)); diff --git a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java index dd3f0ece..e229101c 100644 --- a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java +++ b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java @@ -5,11 +5,11 @@ */ package co.yixiang.aspect; -import co.yixiang.utils.RequestHolder; -import com.google.common.collect.ImmutableList; import co.yixiang.annotation.Limit; import co.yixiang.exception.BadRequestException; +import co.yixiang.utils.RequestHolder; import co.yixiang.utils.StringUtils; +import com.google.common.collect.ImmutableList; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -21,6 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; diff --git a/yshop-common/src/main/java/co/yixiang/config/ElPermissionConfig.java b/yshop-common/src/main/java/co/yixiang/config/ElPermissionConfig.java index 733505d0..1309cf93 100644 --- a/yshop-common/src/main/java/co/yixiang/config/ElPermissionConfig.java +++ b/yshop-common/src/main/java/co/yixiang/config/ElPermissionConfig.java @@ -8,6 +8,7 @@ package co.yixiang.config; import co.yixiang.utils.SecurityUtils; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java b/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java index a51118dd..a3fbab59 100644 --- a/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java +++ b/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java @@ -6,11 +6,11 @@ package co.yixiang.config; import cn.hutool.core.lang.Assert; +import co.yixiang.utils.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.extern.slf4j.Slf4j; -import co.yixiang.utils.StringUtils; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -29,6 +29,7 @@ import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializer; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; diff --git a/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java b/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java index 2d1a533a..8ee7c7a0 100644 --- a/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java +++ b/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java @@ -31,8 +31,10 @@ import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; + import java.util.ArrayList; import java.util.List; + import static com.google.common.collect.Lists.newArrayList; import static springfox.documentation.schema.AlternateTypeRules.newRule; diff --git a/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java b/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java index 641a6b48..eb3d5a68 100644 --- a/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java +++ b/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java @@ -5,8 +5,6 @@ */ package co.yixiang.dozer.config; -import co.yixiang.dozer.service.EJBGenerator; -import co.yixiang.dozer.service.IGenerator; import org.dozer.spring.DozerBeanMapperFactoryBean; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java b/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java index a5c8c0fd..03dd51cb 100644 --- a/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java +++ b/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java @@ -7,6 +7,7 @@ package co.yixiang.enums; import lombok.AllArgsConstructor; import lombok.Getter; + import java.util.stream.Stream; /** diff --git a/yshop-common/src/main/java/co/yixiang/exception/BadRequestException.java b/yshop-common/src/main/java/co/yixiang/exception/BadRequestException.java index 6f58b3e4..b73bd826 100644 --- a/yshop-common/src/main/java/co/yixiang/exception/BadRequestException.java +++ b/yshop-common/src/main/java/co/yixiang/exception/BadRequestException.java @@ -7,6 +7,7 @@ package co.yixiang.exception; import lombok.Getter; import org.springframework.http.HttpStatus; + import static org.springframework.http.HttpStatus.BAD_REQUEST; /** diff --git a/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java b/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java index a5a332cd..5fd8864c 100644 --- a/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java +++ b/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java @@ -6,19 +6,22 @@ package co.yixiang.exception.handler; import co.yixiang.exception.BadRequestException; +import co.yixiang.exception.EntityExistException; +import co.yixiang.exception.EntityNotFoundException; import co.yixiang.exception.ErrorRequestException; import co.yixiang.utils.ThrowableUtil; import lombok.extern.slf4j.Slf4j; -import co.yixiang.exception.EntityExistException; -import co.yixiang.exception.EntityNotFoundException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; + import java.util.Objects; -import static org.springframework.http.HttpStatus.*; + +import static org.springframework.http.HttpStatus.NOT_FOUND; +import static org.springframework.http.HttpStatus.valueOf; /** * @author Zheng Jie diff --git a/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java b/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java index 6c40ee65..e31db2d7 100644 --- a/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java +++ b/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java @@ -5,8 +5,6 @@ */ package co.yixiang.print; -import co.yixiang.utils.OrderUtil; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/yshop-common/src/main/java/co/yixiang/utils/CateDTO.java b/yshop-common/src/main/java/co/yixiang/utils/CateDTO.java index b89f2c7d..d3731633 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/CateDTO.java +++ b/yshop-common/src/main/java/co/yixiang/utils/CateDTO.java @@ -6,8 +6,8 @@ package co.yixiang.utils; - import lombok.Data; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java b/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java index 49820b51..6dec0c76 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/FileUtil.java @@ -13,11 +13,21 @@ import cn.hutool.poi.excel.ExcelUtil; import co.yixiang.exception.BadRequestException; import org.apache.poi.util.IOUtils; import org.springframework.web.multipart.MultipartFile; + import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; import java.security.MessageDigest; import java.text.DecimalFormat; import java.text.SimpleDateFormat; diff --git a/yshop-common/src/main/java/co/yixiang/utils/FontUtil.java b/yshop-common/src/main/java/co/yixiang/utils/FontUtil.java index 94a80ff7..97639592 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/FontUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/FontUtil.java @@ -5,7 +5,8 @@ */ package co.yixiang.utils; -import java.awt.*; +import java.awt.Font; +import java.awt.FontFormatException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java index 1c153079..610568de 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java @@ -9,8 +9,6 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; -import javax.xml.crypto.Data; -import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; diff --git a/yshop-common/src/main/java/co/yixiang/utils/PageUtil.java b/yshop-common/src/main/java/co/yixiang/utils/PageUtil.java index c57f474d..4fd1d21e 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/PageUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/PageUtil.java @@ -6,7 +6,11 @@ package co.yixiang.utils; import org.springframework.data.domain.Page; -import java.util.*; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * 分页工具 diff --git a/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java b/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java index e05c6ed6..f7c574f7 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java +++ b/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java @@ -8,10 +8,19 @@ package co.yixiang.utils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.Cursor; +import org.springframework.data.redis.core.RedisConnectionUtils; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ScanOptions; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.TimeUnit; /** diff --git a/yshop-common/src/main/java/co/yixiang/utils/RequestHolder.java b/yshop-common/src/main/java/co/yixiang/utils/RequestHolder.java index 29ad8724..67445930 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/RequestHolder.java +++ b/yshop-common/src/main/java/co/yixiang/utils/RequestHolder.java @@ -7,6 +7,7 @@ package co.yixiang.utils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; + import javax.servlet.http.HttpServletRequest; import java.util.Objects; diff --git a/yshop-common/src/main/java/co/yixiang/utils/TranslatorUtil.java b/yshop-common/src/main/java/co/yixiang/utils/TranslatorUtil.java index 6c4d31df..805888c8 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/TranslatorUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/TranslatorUtil.java @@ -6,6 +6,7 @@ package co.yixiang.utils; import cn.hutool.json.JSONArray; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; diff --git a/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/util/SwaggerUtil.java b/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/util/SwaggerUtil.java index eeb03792..caf8c747 100644 --- a/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/util/SwaggerUtil.java +++ b/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/util/SwaggerUtil.java @@ -1,8 +1,18 @@ package com.github.xiaoymin.knife4j.spring.util; import io.swagger.models.Model; -import io.swagger.models.properties.*; +import io.swagger.models.properties.AbstractProperty; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.DateTimeProperty; +import io.swagger.models.properties.IntegerProperty; +import io.swagger.models.properties.LongProperty; +import io.swagger.models.properties.ObjectProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.PropertyBuilder; import io.swagger.models.properties.PropertyBuilder.PropertyId; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; import org.springframework.beans.BeanUtils; import java.util.HashMap; diff --git a/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/web/Knife4jController.java b/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/web/Knife4jController.java index f39c5bc7..a9f7a088 100644 --- a/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/web/Knife4jController.java +++ b/yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/web/Knife4jController.java @@ -3,7 +3,12 @@ package com.github.xiaoymin.knife4j.spring.web; import com.github.xiaoymin.knife4j.annotations.ApiOperationSort; import com.github.xiaoymin.knife4j.annotations.ApiSort; import com.github.xiaoymin.knife4j.spring.common.SwaggerBootstrapUiHostNameProvider; -import com.github.xiaoymin.knife4j.spring.model.*; +import com.github.xiaoymin.knife4j.spring.model.MarkdownFiles; +import com.github.xiaoymin.knife4j.spring.model.RestHandlerMapping; +import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUi; +import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUiPath; +import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUiTag; +import com.github.xiaoymin.knife4j.spring.model.SwaggerExt; import com.github.xiaoymin.knife4j.spring.util.SwaggerUtil; import com.google.common.base.Function; import com.google.common.base.Strings; @@ -51,7 +56,14 @@ import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.regex.Pattern; import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE; @@ -416,4 +428,4 @@ public class Knife4jController { } } } -} \ No newline at end of file +} diff --git a/yshop-common/src/test/java/co/yixiang/utils/FileUtilTest.java b/yshop-common/src/test/java/co/yixiang/utils/FileUtilTest.java index e735dc49..d4e03d11 100644 --- a/yshop-common/src/test/java/co/yixiang/utils/FileUtilTest.java +++ b/yshop-common/src/test/java/co/yixiang/utils/FileUtilTest.java @@ -9,7 +9,7 @@ import org.junit.Assert; import org.junit.Test; import org.springframework.mock.web.MockMultipartFile; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class FileUtilTest { diff --git a/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java b/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java index 7ed461b8..6f13a545 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java @@ -5,14 +5,19 @@ */ package co.yixiang.gen.rest; -import co.yixiang.gen.service.GenConfigService; import co.yixiang.gen.domain.GenConfig; +import co.yixiang.gen.service.GenConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author Zheng Jie diff --git a/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java b/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java index c0553a3c..2e110f94 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java @@ -5,17 +5,25 @@ */ package co.yixiang.gen.rest; +import co.yixiang.exception.BadRequestException; import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.gen.service.GenConfigService; import co.yixiang.gen.service.GeneratorService; +import co.yixiang.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.exception.BadRequestException; -import co.yixiang.utils.PageUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java b/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java index dd98b0d5..ffa3dff2 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java @@ -5,11 +5,11 @@ */ package co.yixiang.gen.service; -import co.yixiang.common.web.vo.Paging; import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.gen.domain.GenConfig; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java index 11ecdbba..6d28d991 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java @@ -5,13 +5,14 @@ */ package co.yixiang.gen.service.impl; -import co.yixiang.gen.service.mapper.GenConfigMapper; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.gen.domain.GenConfig; import co.yixiang.gen.service.GenConfigService; +import co.yixiang.gen.service.mapper.GenConfigMapper; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; + import java.io.File; /** diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java index 08b17f64..17f16894 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java @@ -8,14 +8,14 @@ package co.yixiang.gen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.service.mapper.ColumnInfoMapper; -import co.yixiang.gen.utils.GenUtil; import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.exception.BadRequestException; +import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.gen.domain.GenConfig; import co.yixiang.gen.domain.vo.TableInfo; -import co.yixiang.exception.BadRequestException; import co.yixiang.gen.service.GeneratorService; +import co.yixiang.gen.service.mapper.ColumnInfoMapper; +import co.yixiang.gen.utils.GenUtil; import co.yixiang.utils.FileUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.StringUtils; @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java index 64943d77..e5d309d7 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java @@ -5,11 +5,10 @@ */ package co.yixiang.gen.service.mapper; -import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.gen.domain.vo.TableInfo; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java index f02d7571..556ab5d8 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java @@ -5,8 +5,8 @@ */ package co.yixiang.gen.service.mapper; -import co.yixiang.gen.domain.GenConfig; import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.gen.domain.GenConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java b/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java index 5e30b7b3..b63ba853 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java @@ -5,7 +5,9 @@ */ package co.yixiang.gen.utils; -import org.apache.commons.configuration.*; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; /** * sql字段转java diff --git a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java b/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java index f27063cd..21632539 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java @@ -6,19 +6,27 @@ package co.yixiang.gen.utils; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.template.*; +import cn.hutool.extra.template.Template; +import cn.hutool.extra.template.TemplateConfig; +import cn.hutool.extra.template.TemplateEngine; +import cn.hutool.extra.template.TemplateException; +import cn.hutool.extra.template.TemplateUtil; +import co.yixiang.gen.domain.ColumnConfig; import co.yixiang.gen.domain.GenConfig; import co.yixiang.utils.FileUtil; import co.yixiang.utils.StringUtils; import lombok.extern.slf4j.Slf4j; -import co.yixiang.gen.domain.ColumnConfig; import org.springframework.util.ObjectUtils; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.Writer; import java.time.LocalDate; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 代码生成 diff --git a/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java b/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java index a7d9c07c..0fadcb89 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java @@ -5,13 +5,13 @@ */ package co.yixiang.logging.aspect; -import lombok.extern.slf4j.Slf4j; import co.yixiang.logging.domain.Log; import co.yixiang.logging.service.LogService; import co.yixiang.utils.RequestHolder; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; import co.yixiang.utils.ThrowableUtil; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.AfterThrowing; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java b/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java index 4a7d80ea..fa542121 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.NoArgsConstructor; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java b/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java index 9561eea6..2a007789 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java @@ -6,16 +6,21 @@ package co.yixiang.logging.rest; import co.yixiang.logging.aop.log.Log; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import co.yixiang.logging.service.LogService; import co.yixiang.logging.service.dto.LogQueryCriteria; import co.yixiang.utils.SecurityUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java b/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java index 600ca892..4ace7803 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java @@ -5,8 +5,8 @@ */ package co.yixiang.logging.service; -import co.yixiang.logging.domain.Log; import co.yixiang.common.service.BaseService; +import co.yixiang.logging.domain.Log; import co.yixiang.logging.service.dto.LogQueryCriteria; import org.aspectj.lang.ProceedingJoinPoint; import org.springframework.data.domain.Pageable; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java index aa6a86ed..c5d3f8e3 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java @@ -6,6 +6,7 @@ package co.yixiang.logging.service.dto; import lombok.Data; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java index 33d0a7d6..3d2c7dfb 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java @@ -7,6 +7,7 @@ package co.yixiang.logging.service.dto; import co.yixiang.annotation.Query; import lombok.Data; + import java.sql.Timestamp; import java.util.List; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java index ab88b05b..21308c86 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java @@ -6,6 +6,7 @@ package co.yixiang.logging.service.dto; import lombok.Data; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java index 8a8e656b..bf7d4415 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java @@ -8,16 +8,18 @@ package co.yixiang.logging.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONObject; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.logging.service.mapper.LogMapper; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; +import co.yixiang.logging.aop.log.Log; import co.yixiang.logging.service.LogService; import co.yixiang.logging.service.dto.LogErrorDTO; import co.yixiang.logging.service.dto.LogQueryCriteria; import co.yixiang.logging.service.dto.LogSmallDTO; -import co.yixiang.utils.*; +import co.yixiang.logging.service.mapper.LogMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.StringUtils; +import co.yixiang.utils.ValidationUtil; import com.github.pagehelper.PageInfo; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java b/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java index 9f73c113..a936cb0c 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; + import java.util.List; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java b/yshop-mp/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java index b2a4be4f..382c476c 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java @@ -5,7 +5,17 @@ */ package co.yixiang.mp.config; -import co.yixiang.mp.handler.*; +import co.yixiang.mp.handler.KfSessionHandler; +import co.yixiang.mp.handler.LocationHandler; +import co.yixiang.mp.handler.LogHandler; +import co.yixiang.mp.handler.MenuHandler; +import co.yixiang.mp.handler.MsgHandler; +import co.yixiang.mp.handler.NullHandler; +import co.yixiang.mp.handler.RedisHandler; +import co.yixiang.mp.handler.ScanHandler; +import co.yixiang.mp.handler.StoreCheckNotifyHandler; +import co.yixiang.mp.handler.SubscribeHandler; +import co.yixiang.mp.handler.UnsubscribeHandler; import co.yixiang.utils.RedisUtil; import com.google.common.collect.Maps; import me.chanjar.weixin.common.api.WxConsts; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java index 2f0b0a6d..e60e945c 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java @@ -6,8 +6,6 @@ package co.yixiang.mp.controller; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxArticle; import co.yixiang.mp.service.YxArticleService; import co.yixiang.mp.service.dto.YxArticleDto; @@ -20,7 +18,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Date; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java index a10b12fc..bad4c6d0 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java @@ -6,13 +6,11 @@ package co.yixiang.mp.controller; -import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.domain.YxWechatMenu; import co.yixiang.mp.service.YxWechatMenuService; import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.RedisUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,11 +19,14 @@ import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.bean.menu.WxMenu; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +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 hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java index 9b9e7351..6451b74d 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java @@ -6,19 +6,20 @@ package co.yixiang.mp.controller; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.YxWechatReplyService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +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 hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java index 949cbdfb..8388109d 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java @@ -5,9 +5,7 @@ */ package co.yixiang.mp.controller; -import cn.hutool.core.util.StrUtil; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.mp.service.dto.YxWechatTemplateDto; @@ -15,14 +13,18 @@ import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import lombok.extern.java.Log; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java index a6a13c06..3de73aed 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java @@ -4,13 +4,14 @@ */ package co.yixiang.mp.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java index dbb2e00f..d09d9fc0 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java @@ -4,10 +4,15 @@ */ package co.yixiang.mp.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java index c5163f68..90f6eaff 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java @@ -4,12 +4,14 @@ */ package co.yixiang.mp.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java index d5d50746..7db38388 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java @@ -4,14 +4,15 @@ */ package co.yixiang.mp.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/handler/LogHandler.java b/yshop-mp/src/main/java/co/yixiang/mp/handler/LogHandler.java index 023075c9..eb1790b1 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/handler/LogHandler.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/handler/LogHandler.java @@ -5,7 +5,6 @@ */ package co.yixiang.mp.handler; -import co.yixiang.mp.utils.JsonUtils; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/handler/MsgHandler.java b/yshop-mp/src/main/java/co/yixiang/mp/handler/MsgHandler.java index 7a11d018..ba59699a 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/handler/MsgHandler.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/handler/MsgHandler.java @@ -6,7 +6,6 @@ package co.yixiang.mp.handler; import co.yixiang.mp.builder.TextBuilder; -import co.yixiang.mp.utils.JsonUtils; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/handler/ScanHandler.java b/yshop-mp/src/main/java/co/yixiang/mp/handler/ScanHandler.java index 17f17db7..e2b926ed 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/handler/ScanHandler.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/handler/ScanHandler.java @@ -5,15 +5,14 @@ */ package co.yixiang.mp.handler; -import java.util.Map; - -import org.springframework.stereotype.Component; - import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; +import org.springframework.stereotype.Component; + +import java.util.Map; @Component public class ScanHandler extends AbstractHandler { diff --git a/yshop-mp/src/main/java/co/yixiang/mp/handler/SubscribeHandler.java b/yshop-mp/src/main/java/co/yixiang/mp/handler/SubscribeHandler.java index e5f5cca9..743aa6db 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/handler/SubscribeHandler.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/handler/SubscribeHandler.java @@ -5,23 +5,19 @@ */ package co.yixiang.mp.handler; -import java.io.UnsupportedEncodingException; -import java.util.Map; - import cn.hutool.core.util.ObjectUtil; import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.YxWechatReplyService; import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import co.yixiang.mp.builder.TextBuilder; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; -import me.chanjar.weixin.mp.bean.result.WxMpUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; @Component diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxArticleService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxArticleService.java index 77ac021a..9ab8d81c 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxArticleService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxArticleService.java @@ -4,16 +4,18 @@ */ package co.yixiang.mp.service; + import co.yixiang.common.service.BaseService; import co.yixiang.mp.domain.YxArticle; import co.yixiang.mp.service.dto.YxArticleDto; import co.yixiang.mp.service.dto.YxArticleQueryCriteria; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxMiniPayService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxMiniPayService.java index 80ec1a18..6a9c39f9 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxMiniPayService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxMiniPayService.java @@ -12,7 +12,6 @@ import co.yixiang.mp.config.WxPayConfiguration; import co.yixiang.mp.handler.RedisHandler; import com.github.binarywang.wxpay.bean.entpay.EntPayRequest; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; -import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.exception.WxPayException; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxPayService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxPayService.java index d37f9ecc..11243eab 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxPayService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxPayService.java @@ -6,7 +6,6 @@ package co.yixiang.mp.service; import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.exception.ErrorRequestException; import co.yixiang.mp.config.ShopKeyUtils; import co.yixiang.mp.config.WxPayConfiguration; @@ -20,11 +19,8 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; - /** * @ClassName 公众号支付YxPayService * @Author hupeng <610796224@qq.com> diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatMenuService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatMenuService.java index 6474d17a..6fe11fc5 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatMenuService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatMenuService.java @@ -4,15 +4,17 @@ */ package co.yixiang.mp.service; + import co.yixiang.common.service.BaseService; import co.yixiang.mp.domain.YxWechatMenu; import co.yixiang.mp.service.dto.YxWechatMenuDto; import co.yixiang.mp.service.dto.YxWechatMenuQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatReplyService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatReplyService.java index 228ad383..c7752358 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatReplyService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatReplyService.java @@ -4,15 +4,17 @@ */ package co.yixiang.mp.service; + import co.yixiang.common.service.BaseService; import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.dto.YxWechatReplyDto; import co.yixiang.mp.service.dto.YxWechatReplyQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java index 012fd646..4909c690 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java @@ -4,15 +4,17 @@ */ package co.yixiang.mp.service; + import co.yixiang.common.service.BaseService; import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.dto.YxWechatTemplateDto; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleDto.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleDto.java index 73b77a78..42d3cbcc 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleDto.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleDto.java @@ -6,6 +6,7 @@ package co.yixiang.mp.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleQueryCriteria.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleQueryCriteria.java index 6e108cda..aad33603 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleQueryCriteria.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxArticleQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.mp.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java index 77aa48af..57af3cdf 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java @@ -6,6 +6,7 @@ package co.yixiang.mp.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuQueryCriteria.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuQueryCriteria.java index 45bd5eb8..b7b28534 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuQueryCriteria.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.mp.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java index 4ce09f26..16a57d6b 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java @@ -6,6 +6,7 @@ package co.yixiang.mp.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyQueryCriteria.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyQueryCriteria.java index 2fa07dea..73e03629 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyQueryCriteria.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.mp.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java index ffd523ed..5882601b 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java @@ -6,6 +6,7 @@ package co.yixiang.mp.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateQueryCriteria.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateQueryCriteria.java index 856b47ba..eb1040a8 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateQueryCriteria.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.mp.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/WxMpTemplateMessageServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/WxMpTemplateMessageServiceImpl.java index 8a911349..04e62864 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/WxMpTemplateMessageServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/WxMpTemplateMessageServiceImpl.java @@ -5,15 +5,12 @@ */ package co.yixiang.mp.service.impl; -import cn.hutool.core.util.StrUtil; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.service.WxMpTemplateMessageService; -import co.yixiang.utils.RedisUtil; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.template.WxMpTemplateData; import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java index 1b7fbc3b..a83851a8 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java @@ -8,19 +8,19 @@ package co.yixiang.mp.service.impl; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.ErrorRequestException; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.domain.YxArticle; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.mp.utils.URLUtils; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.mp.service.YxArticleService; import co.yixiang.mp.service.dto.YxArticleDto; import co.yixiang.mp.service.dto.YxArticleQueryCriteria; import co.yixiang.mp.service.mapper.ArticleMapper; +import co.yixiang.mp.utils.URLUtils; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; @@ -33,22 +33,23 @@ import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.io.File; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java index ae190486..31880d4d 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java @@ -5,30 +5,34 @@ */ package co.yixiang.mp.service.impl; -import co.yixiang.mp.domain.YxWechatMenu; import co.yixiang.common.service.impl.BaseServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.mp.domain.YxWechatMenu; import co.yixiang.mp.service.YxWechatMenuService; import co.yixiang.mp.service.dto.YxWechatMenuDto; import co.yixiang.mp.service.dto.YxWechatMenuQueryCriteria; import co.yixiang.mp.service.mapper.WechatMenuMapper; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java index 9dbf6e8e..9e78c58f 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java @@ -5,31 +5,35 @@ */ package co.yixiang.mp.service.impl; -import co.yixiang.mp.domain.YxWechatReply; -import co.yixiang.exception.EntityExistException; import co.yixiang.common.service.impl.BaseServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.EntityExistException; +import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.YxWechatReplyService; import co.yixiang.mp.service.dto.YxWechatReplyDto; import co.yixiang.mp.service.dto.YxWechatReplyQueryCriteria; import co.yixiang.mp.service.mapper.WechatReplyMapper; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java index 57e4770d..10e44bd0 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java @@ -5,33 +5,34 @@ */ package co.yixiang.mp.service.impl; -import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.common.service.impl.BaseServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.mp.service.dto.YxWechatTemplateDto; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; import co.yixiang.mp.service.mapper.WechatTemplateMapper; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java index 0675063a..369145d3 100644 --- a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java +++ b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java @@ -7,12 +7,16 @@ package co.yixiang.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.annotation.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; -import co.yixiang.annotation.Query; + import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; /** * @author Zheng Jie diff --git a/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java b/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java index d574170e..a84d3617 100644 --- a/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java +++ b/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java @@ -19,7 +19,6 @@ import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; import java.sql.Timestamp; -import java.util.Date; /** * 处理新增和更新的基础数据填充，配合BaseEntity和MyBatisPlusConfig使用 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java index 18dbbcd2..0938deb0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java @@ -4,15 +4,21 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; -import javax.validation.constraints.*; -import java.sql.Timestamp; -import java.math.BigDecimal; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index 54085d0a..0fde3e03 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -4,14 +4,21 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; -import java.sql.Timestamp; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java index 5d476862..f3bc97c4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java @@ -4,17 +4,19 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java index 3d55eba7..a728dcbd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java @@ -4,14 +4,16 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotNull; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java index 66cf0a3a..4d953977 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java index b961cba1..14b8b114 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java @@ -4,12 +4,15 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index dd65eb00..3b53d02c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -4,12 +4,15 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index 9594e2dd..df1fafcf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -4,15 +4,21 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; -import javax.validation.constraints.*; -import java.sql.Timestamp; -import java.math.BigDecimal; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java index f0a9812e..22599135 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java index 20f8b3a7..16f8e3bd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java @@ -4,12 +4,15 @@ */ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index d7ee2a72..27aeb883 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -18,7 +18,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 7deaddd8..5cc22caa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -20,7 +20,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java index 4be8f328..d87db425 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java @@ -17,7 +17,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java index c0d42819..e1210b4a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java @@ -18,7 +18,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java index e3b67efb..a770e352 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java @@ -16,7 +16,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java index abc68fec..44a182a2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java @@ -14,7 +14,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java index 631d2547..27ad88e9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java @@ -14,7 +14,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index fd123d08..9756feea 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -18,7 +18,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index d9ef85ee..1591c068 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -8,9 +8,9 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.YxUserExtractService; import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; @@ -33,7 +33,11 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java index db08ad6b..a7d56233 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.dto.YxStoreBargainDto; import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java index 562fd19c..a37b7861 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.service.dto.YxStoreCombinationDto; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java index 39a67d8b..b6e2247f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCouponIssue; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java index 81594f60..02943b65 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java index 6f0ccfee..ba4bcfcc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.modules.activity.service.dto.YxStoreCouponDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java index 4dda17fc..bd35f973 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java index ae77b3f5..c261252e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.service.dto.YxStorePinkDto; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java index 4e192a84..0a341ac5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java index 04557433..f53a11b5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreVisit; import co.yixiang.modules.activity.service.dto.YxStoreVisitDto; import co.yixiang.modules.activity.service.dto.YxStoreVisitQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java index e13ad826..67adfe4a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.activity.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.dto.YxUserExtractDto; import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java index da145d0c..2cc614b5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java @@ -6,9 +6,10 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.sql.Timestamp; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainQueryCriteria.java index c08e2dbd..cc56e038 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index d8ef6a94..c8306792 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -6,9 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.sql.Timestamp; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java index a52e0d11..f90a511d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java index 67f28813..e9bd9507 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java index 5708fb94..b2c24532 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java index b08258cf..71365c3c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java index 475d368d..9d70eb29 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java index b05e212f..58d5bf14 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java index c224be24..9c45b388 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java index a307253b..1ef6789d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java index a33396d7..7fb9333f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java index 6e131545..239392ed 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java index c80a3af5..3b95ce39 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java index 94762c74..e476065f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java @@ -6,9 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.sql.Timestamp; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillQueryCriteria.java index 56f63d77..a83e1206 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java index 79b08728..164ed5f1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java index 04324b7f..14577597 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java index 9e92200a..75c095e7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java index 821072f1..5a41c9a4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.activity.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 76202290..dde82667 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.dto.YxStoreBargainDto; import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreBargainMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 669c4f55..cd4392fa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -5,39 +5,38 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.domain.YxStoreVisit; -import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; -import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.dto.YxStoreCombinationDto; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCombinationMapper; +import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; +import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java index e84fbdba..10835984 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreCouponIssue; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreCouponIssue; import co.yixiang.modules.activity.service.YxStoreCouponIssueService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java index bde13057..f8d83d6e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; import co.yixiang.modules.activity.service.YxStoreCouponIssueUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueUserMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java index 3da1e6bf..37f8d51e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.modules.activity.service.YxStoreCouponService; import co.yixiang.modules.activity.service.dto.YxStoreCouponDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index 5484ea76..ffe60597 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -5,37 +5,36 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.shop.domain.YxUser; -import co.yixiang.modules.shop.service.YxUserService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDto; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper; +import co.yixiang.modules.shop.domain.YxUser; +import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index e1c54fa1..a5f8ad12 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.activity.service.dto.YxStorePinkDto; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index 2c7f738c..f0d6f4ae 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -5,34 +5,34 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.utils.*; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreSeckillMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.OrderUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java index 5d3b883c..09df8e9e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxStoreVisit; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxStoreVisit; import co.yixiang.modules.activity.service.YxStoreVisitService; import co.yixiang.modules.activity.service.dto.YxStoreVisitDto; import co.yixiang.modules.activity.service.dto.YxStoreVisitQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java index c9917c8f..d72b739d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java @@ -5,34 +5,33 @@ */ package co.yixiang.modules.activity.service.impl; -import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.YxUserExtractService; import co.yixiang.modules.activity.service.dto.YxUserExtractDto; import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxUserExtractMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java index 13565c09..5b906803 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java @@ -4,10 +4,12 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java index f0465608..f8578115 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java @@ -4,12 +4,19 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java index e3b5330a..051c3f36 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java @@ -4,12 +4,19 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java index cab56fa0..e943770e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java index 93d2d62d..54474602 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java @@ -4,10 +4,12 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java index 3de154fc..11e6672a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java @@ -4,12 +4,16 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java index 803baf98..7ff6ed5a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java @@ -4,12 +4,14 @@ */ package co.yixiang.modules.shop.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java index a14505e4..b8e21236 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java index bc857c5e..f4eb300b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java @@ -4,18 +4,20 @@ */ package co.yixiang.modules.shop.domain; -import co.yixiang.annotation.Query; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java index 53b557d2..cfd23457 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java index c6f40dc7..fc298e1b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java index 4fb6d03d..185ca8be 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java @@ -4,14 +4,16 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; -import javax.validation.constraints.*; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java index d413c261..d0de73d6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java @@ -4,10 +4,14 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java index d4e1e4b0..6c9e64c1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java index c14b92c6..08ae4652 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java @@ -4,10 +4,13 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java index 81586f0d..7420710d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java @@ -4,10 +4,14 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java index 71963ebb..7c2f19d9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java @@ -4,10 +4,14 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java index 914a3a39..6a30efc0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java @@ -4,15 +4,19 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java index 3a00b7cc..6ae2c3df 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java @@ -4,10 +4,15 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java index e2be7bff..cb0ff62c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java @@ -4,12 +4,17 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java index 4c81556b..9af7ff1c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java @@ -4,12 +4,17 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java index 96e77aca..81b56b47 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java @@ -4,12 +4,17 @@ */ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java index 2a98fa98..91f27c1e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java @@ -4,14 +4,16 @@ */ package co.yixiang.modules.shop.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java index c022a8cd..97484a58 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java @@ -16,7 +16,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java index 3e39cb92..b6138f12 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java @@ -17,7 +17,14 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java index 2f68ec88..443e94dc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java @@ -15,7 +15,14 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java index 0d327fbc..b8ca9100 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java @@ -22,7 +22,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java index 68a6fbf7..90a587ab 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java @@ -7,8 +7,8 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.StrUtil; import co.yixiang.constant.ShopConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; @@ -22,7 +22,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index 53cf43ff..1007d39f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -10,21 +10,28 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.logging.aop.log.Log; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.express.ExpressService; -import co.yixiang.tools.express.dao.ExpressInfo; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.domain.YxWechatUser; -import co.yixiang.modules.shop.service.*; -import co.yixiang.modules.shop.service.dto.*; +import co.yixiang.modules.shop.service.YxExpressService; +import co.yixiang.modules.shop.service.YxStoreOrderService; +import co.yixiang.modules.shop.service.YxStoreOrderStatusService; +import co.yixiang.modules.shop.service.YxWechatUserService; +import co.yixiang.modules.shop.service.dto.OrderCountDto; +import co.yixiang.modules.shop.service.dto.YxExpressDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; +import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.param.ExpressParam; import co.yixiang.mp.service.YxTemplateService; +import co.yixiang.tools.express.ExpressService; +import co.yixiang.tools.express.dao.ExpressInfo; import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -41,7 +48,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java index d3ad2206..d9fa1ce1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java @@ -7,8 +7,8 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.constant.ShopConstants; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.dto.YxStoreProductQueryCriteria; @@ -23,7 +23,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java index 7b579b80..7275b655 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java @@ -16,7 +16,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java index 2f86c0f7..02cc07ee 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java @@ -25,7 +25,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +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 hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java index 54a2dee0..260c8620 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java @@ -7,9 +7,9 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.constant.ShopConstants; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; @@ -25,7 +25,14 @@ import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index 862665bc..77ad9ce5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -27,7 +27,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java index 4c82d045..d9c542f7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java @@ -5,8 +5,8 @@ */ package co.yixiang.modules.shop.rest; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.modules.shop.service.YxSystemStoreService; @@ -21,7 +21,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java index 610a57c2..7bece10f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java @@ -17,7 +17,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java index f148c5a1..6030f1a9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java @@ -18,7 +18,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java index 5b98bf37..72b16883 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java @@ -5,8 +5,8 @@ */ package co.yixiang.modules.shop.rest; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.YxUserRechargeService; import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; @@ -18,7 +18,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java index 7e1956b8..90142393 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java @@ -4,23 +4,32 @@ */ package co.yixiang.modules.shop.rest; -import java.util.Arrays; + import co.yixiang.dozer.service.IGenerator; -import lombok.AllArgsConstructor; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.modules.shop.service.YxWechatUserService; -import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; import co.yixiang.modules.shop.service.dto.YxWechatUserDto; +import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; -import java.io.IOException; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; +import java.io.IOException; +import java.util.Arrays; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java index 11fe5cee..845b30d0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxExpress; import co.yixiang.modules.shop.service.dto.YxExpressDto; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java index fcb96d62..f4d0f44f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxMaterialGroup; import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto; import co.yixiang.modules.shop.service.dto.YxMaterialGroupQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java index 2c4a35f1..b734c459 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.modules.shop.service.dto.YxMaterialDto; import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java index 15304c48..1d2cc5f6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java @@ -4,16 +4,18 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreCart; import co.yixiang.modules.shop.service.dto.CountDto; import co.yixiang.modules.shop.service.dto.YxStoreCartDto; import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java index b45f37ce..f3ac761d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java index e79788eb..33069759 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java index f18ca1be..a73e0b5b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java @@ -4,6 +4,7 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.service.dto.OrderCountDto; @@ -11,10 +12,11 @@ import co.yixiang.modules.shop.service.dto.OrderTimeDataDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java index 67d632a9..ec023bd6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java index 804dbaa4..35d1b629 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java @@ -4,13 +4,9 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; -import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java index 788980bc..716d6065 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java @@ -4,13 +4,9 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProductAttr; -import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java index d0397295..d287efe1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java @@ -4,13 +4,9 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; -import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java index 5b687f24..bb7cda28 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProductReply; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java index 3fd69ea0..9eaabfe2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java @@ -4,16 +4,18 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.service.dto.ProductFormatDto; import co.yixiang.modules.shop.service.dto.YxStoreProductDto; import co.yixiang.modules.shop.service.dto.YxStoreProductQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java index f1fc916e..1af7b7d0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java index 48c63b4f..ba688ab8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java index 6bb39dae..046aca55 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java index 5732d4ac..71a55c29 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java index e59224ed..22c12557 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDto; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java index 74e9942f..a5b9d3bd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemUserTask; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDto; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java index 97732530..10699375 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.dto.YxUserBillDto; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java index d6f8376f..b93e2c77 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java index 8ee6a032..9a94a643 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java @@ -4,16 +4,18 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.service.dto.UserMoneyDto; import co.yixiang.modules.shop.service.dto.YxUserDto; import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java index 5b67e099..2a7c2b11 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.shop.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java index d2e92465..4b7e311a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java @@ -8,7 +8,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java index 55c561c3..ef034eb3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java index ff0643f6..a18c6964 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java index 0e48be26..cfaa66f2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java index a40c1c9d..9a694cbb 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java index 8198d6c4..0215aaae 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java index 9f33bf25..61b3c6d2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java index 724b1d49..c0e4ce6d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java index 78c719ec..32b43836 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java index 2cd81c39..e4f3516b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java @@ -7,6 +7,7 @@ package co.yixiang.modules.shop.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; + import java.io.Serializable; import java.util.List; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java index 5f412073..d4a048fb 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java index d5b2529c..0d139b73 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java @@ -5,11 +5,9 @@ */ package co.yixiang.modules.shop.service.dto; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serializable; -import java.util.List; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java index c858c686..5355e235 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java index 900efabe..d3cddb85 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java index 42362a0c..54fd12f3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java index 94ccdd5e..46931783 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java @@ -5,9 +5,10 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; + +import java.util.List; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java index b1bf30d4..765c914c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java index 454d899d..72d89485 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java index 22b684b7..2c629d3d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java index 177d3edc..fd8829b6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java index 76556cf3..ff14753f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java index 1c6dcbc5..5de24071 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java index 2ac14739..17a2dd48 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java @@ -8,7 +8,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java index 701dd5e5..2f9cc833 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java index 3fc2d816..fefdfd93 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java index 866f9cc2..c53d5054 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; import java.util.Map; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java index 78e00adc..38d587fc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java @@ -5,8 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java index 1a1e4816..896e0b6f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; import java.util.Date; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java index bbb73295..1216f0b7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java index f93259ad..c558c975 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java index bfd1474e..53e6e7d6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java index b5c77fe7..416ca051 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java index 64ebd562..acdd6e89 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java index 35143569..fc43ae37 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java index 4461be1a..f307dde8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java index 8d267923..0d19fd26 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java index 79cc0af5..b814ff19 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java index 36039889..48cf0782 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java index 3096523a..225a2462 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java index 89bb2ec8..544fc654 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java index 8504e612..ee2b4790 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java @@ -5,9 +5,8 @@ */ package co.yixiang.modules.shop.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java index e51481da..2f1c1ed8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java @@ -8,7 +8,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; /** diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java index ebb60cc6..ce95226b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java index 9dfd4bf3..1b58e165 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java index 5d397d19..f2c7a27b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxExpress; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxExpress; import co.yixiang.modules.shop.service.YxExpressService; import co.yixiang.modules.shop.service.dto.YxExpressDto; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; import co.yixiang.modules.shop.service.mapper.ExpressMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java index b25c44df..39b7d0a0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxMaterialGroup; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxMaterialGroup; import co.yixiang.modules.shop.service.YxMaterialGroupService; import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto; import co.yixiang.modules.shop.service.dto.YxMaterialGroupQueryCriteria; import co.yixiang.modules.shop.service.mapper.MaterialGroupMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java index 01a5323c..75387a18 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.modules.shop.service.YxMaterialService; import co.yixiang.modules.shop.service.dto.YxMaterialDto; import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria; import co.yixiang.modules.shop.service.mapper.MaterialMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java index e955fa84..ed2270fb 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -5,33 +5,34 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreCart; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.shop.service.dto.CountDto; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxStoreCart; import co.yixiang.modules.shop.service.YxStoreCartService; +import co.yixiang.modules.shop.service.dto.CountDto; import co.yixiang.modules.shop.service.dto.YxStoreCartDto; import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria; import co.yixiang.modules.shop.service.mapper.StoreCartMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index c353e0ae..578606f6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -5,31 +5,38 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import co.yixiang.modules.shop.service.mapper.StoreCategoryMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.io.IOException; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java index 94e2de4c..168b04ca 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; import co.yixiang.modules.shop.service.YxStoreOrderCartInfoService; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria; import co.yixiang.modules.shop.service.mapper.StoreOrderCartInfoMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 918f4453..3942b92a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -8,42 +8,66 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.shop.domain.*; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.shop.service.*; -import co.yixiang.modules.shop.service.dto.*; +import co.yixiang.modules.shop.domain.YxStoreOrder; +import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; +import co.yixiang.modules.shop.domain.YxStoreOrderStatus; +import co.yixiang.modules.shop.domain.YxStoreProduct; +import co.yixiang.modules.shop.domain.YxUser; +import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.service.YxStoreCartService; +import co.yixiang.modules.shop.service.YxStoreOrderCartInfoService; +import co.yixiang.modules.shop.service.YxStoreOrderService; +import co.yixiang.modules.shop.service.YxStoreOrderStatusService; +import co.yixiang.modules.shop.service.YxSystemStoreService; +import co.yixiang.modules.shop.service.YxUserBillService; +import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.modules.shop.service.dto.CountDto; +import co.yixiang.modules.shop.service.dto.OrderCountDto; +import co.yixiang.modules.shop.service.dto.OrderTimeDataDto; +import co.yixiang.modules.shop.service.dto.StoreOrderCartInfoDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; +import co.yixiang.modules.shop.service.dto.YxUserDto; +import co.yixiang.modules.shop.service.mapper.StoreOrderMapper; import co.yixiang.modules.shop.service.mapper.StoreProductMapper; import co.yixiang.modules.shop.service.mapper.UserMapper; import co.yixiang.mp.service.YxMiniPayService; import co.yixiang.mp.service.YxPayService; -import co.yixiang.utils.*; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.binarywang.wxpay.exception.WxPayException; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.modules.shop.service.mapper.StoreOrderMapper; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.math.BigDecimal; -import java.util.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java index 49c0dc12..cc051027 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.service.YxStoreOrderStatusService; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusQueryCriteria; import co.yixiang.modules.shop.service.mapper.StoreOrderStatusMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java index 7faf2913..c2740e8b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java @@ -5,11 +5,11 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; import co.yixiang.modules.shop.service.mapper.StoreProductAttrResultMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java index f28c74b1..7614ab85 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java @@ -5,11 +5,11 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.modules.shop.service.YxStoreProductAttrService; import co.yixiang.modules.shop.service.mapper.StoreProductAttrMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java index 210ef917..02d55c50 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java @@ -5,11 +5,11 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; import co.yixiang.modules.shop.service.mapper.StoreProductAttrValueMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index 9b322660..a1dea528 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -5,39 +5,37 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxStoreProduct; -import co.yixiang.modules.shop.domain.YxStoreProductReply; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.shop.domain.YxUser; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxStoreProductReply; +import co.yixiang.modules.shop.service.YxStoreProductReplyService; import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.YxUserService; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; -import co.yixiang.modules.shop.service.YxStoreProductReplyService; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import co.yixiang.modules.shop.service.mapper.StoreProductReplyMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.stream.Collector; -import java.util.stream.Collectors; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index a7fd2e80..7ee8d210 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -8,38 +8,54 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreProduct; -import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; -import co.yixiang.modules.shop.service.*; -import co.yixiang.modules.shop.service.dto.*; -import co.yixiang.utils.*; +import co.yixiang.modules.shop.service.YxStoreCategoryService; +import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; +import co.yixiang.modules.shop.service.YxStoreProductAttrService; +import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.dto.DetailDto; +import co.yixiang.modules.shop.service.dto.FromatDetailDto; +import co.yixiang.modules.shop.service.dto.ProductFormatDto; +import co.yixiang.modules.shop.service.dto.YxStoreProductDto; +import co.yixiang.modules.shop.service.dto.YxStoreProductQueryCriteria; +import co.yixiang.modules.shop.service.mapper.StoreProductMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.modules.shop.service.mapper.StoreProductMapper; +import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.math.BigDecimal; -import java.util.*; -import java.io.IOException; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index bd319157..b9318fb3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -5,33 +5,34 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.utils.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; import co.yixiang.modules.shop.service.mapper.SystemConfigMapper; +import co.yixiang.utils.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index 3f936745..b9c7d7a1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -5,33 +5,34 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.common.service.impl.BaseServiceImpl; -import com.alibaba.fastjson.JSON; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; import co.yixiang.modules.shop.service.mapper.SystemGroupDataMapper; +import co.yixiang.utils.FileUtil; +import com.alibaba.fastjson.JSON; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 6c63a8ad..1c04f8a8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; import co.yixiang.modules.shop.service.mapper.SystemStoreMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java index 4e9e73f3..f2619abf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.modules.shop.service.YxSystemStoreStaffService; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria; import co.yixiang.modules.shop.service.mapper.SystemStoreStaffMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java index 1f51ea9b..d072e58a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.modules.shop.service.YxSystemUserLevelService; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDto; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria; import co.yixiang.modules.shop.service.mapper.SystemUserLevelMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index 8b23a276..15866c0c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -5,33 +5,32 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.dto.YxUserBillDto; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.shop.service.mapper.UserBillMapper; -import org.apache.xmlbeans.impl.xb.xmlconfig.Qnametargetlist; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java index 6aef02f3..194dd942 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.YxUserRechargeService; import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; import co.yixiang.modules.shop.service.mapper.UserRechargeMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java index 7b09ac5a..b7ecdfdc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java @@ -6,37 +6,38 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.NumberUtil; -import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.YxUserBillService; -import co.yixiang.modules.shop.service.dto.UserMoneyDto; -import co.yixiang.utils.OrderUtil; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.modules.shop.service.dto.UserMoneyDto; import co.yixiang.modules.shop.service.dto.YxUserDto; import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; import co.yixiang.modules.shop.service.mapper.UserMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.OrderUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java index 1e2d113a..6e3b5d07 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.modules.shop.service.impl; -import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.modules.shop.service.YxWechatUserService; import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; import co.yixiang.modules.shop.service.mapper.WechatUserMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java index 3e4dd6e0..7f1d8141 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java @@ -9,7 +9,6 @@ import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreProduct; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java index e00272f0..c79d58a7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java @@ -10,13 +10,10 @@ import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.dto.YxUserBillDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.ResultType; import org.apache.ibatis.annotations.Select; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/AppRun.java b/yshop-system/src/main/java/co/yixiang/AppRun.java index 3fa76f73..7163ce5d 100644 --- a/yshop-system/src/main/java/co/yixiang/AppRun.java +++ b/yshop-system/src/main/java/co/yixiang/AppRun.java @@ -4,7 +4,7 @@ */ package co.yixiang; -import co.yixiang.modules.activity.service.YxStoreCouponUserService; + import co.yixiang.annotation.AnonymousAccess; import co.yixiang.utils.SpringContextHolder; import org.mybatis.spring.annotation.MapperScan; diff --git a/yshop-system/src/main/java/co/yixiang/config/DataScope.java b/yshop-system/src/main/java/co/yixiang/config/DataScope.java index 41912a1b..87b49909 100644 --- a/yshop-system/src/main/java/co/yixiang/config/DataScope.java +++ b/yshop-system/src/main/java/co/yixiang/config/DataScope.java @@ -5,14 +5,15 @@ */ package co.yixiang.config; +import co.yixiang.modules.system.domain.Dept; +import co.yixiang.modules.system.service.DeptService; +import co.yixiang.modules.system.service.RoleService; import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.RoleSmallDto; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.utils.SecurityUtils; -import co.yixiang.modules.system.domain.Dept; -import co.yixiang.modules.system.service.DeptService; -import co.yixiang.modules.system.service.RoleService; import org.springframework.stereotype.Component; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/yshop-system/src/main/java/co/yixiang/config/MybatisPlusConfig.java b/yshop-system/src/main/java/co/yixiang/config/MybatisPlusConfig.java index 2f458f9d..4e2a1130 100644 --- a/yshop-system/src/main/java/co/yixiang/config/MybatisPlusConfig.java +++ b/yshop-system/src/main/java/co/yixiang/config/MybatisPlusConfig.java @@ -2,7 +2,6 @@ package co.yixiang.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/yshop-system/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java b/yshop-system/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java index 03eb5e24..86bf0d6e 100644 --- a/yshop-system/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java +++ b/yshop-system/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java @@ -10,6 +10,7 @@ import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + import java.util.concurrent.Executor; import java.util.concurrent.ThreadPoolExecutor; diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java index 467d8aa5..e4ba27f3 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java index 862bd22d..34cda6f6 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java @@ -9,7 +9,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author Zheng Jie diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java index fe3734b4..cd98b033 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.quartz.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java index 67c3b1d7..f7649d5a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.quartz.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java index 7c970252..3c633435 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java @@ -5,9 +5,9 @@ */ package co.yixiang.modules.quartz.rest; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.quartz.domain.QuartzJob; import co.yixiang.modules.quartz.service.QuartzJobService; import co.yixiang.modules.quartz.service.QuartzLogService; @@ -24,7 +24,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java index 7164f786..124030b4 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.quartz.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.quartz.domain.QuartzJob; import co.yixiang.modules.quartz.service.dto.QuartzJobDto; import co.yixiang.modules.quartz.service.dto.QuartzJobQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java index 38d7318f..3add178e 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java @@ -4,15 +4,17 @@ */ package co.yixiang.modules.quartz.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.quartz.domain.QuartzLog; import co.yixiang.modules.quartz.service.dto.QuartzLogDto; import co.yixiang.modules.quartz.service.dto.QuartzLogQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java index 0d330abe..e479908b 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.quartz.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java index 6f4ea941..2d6d45b5 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java @@ -5,11 +5,11 @@ */ package co.yixiang.modules.quartz.service.dto; +import co.yixiang.annotation.Query; import lombok.Data; import java.sql.Timestamp; import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java index 7b9887a0..1edc0f41 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java @@ -6,8 +6,9 @@ package co.yixiang.modules.quartz.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java index 11202d41..193afa6c 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.modules.quartz.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java index 11dae829..1fb1ccbf 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -5,33 +5,35 @@ */ package co.yixiang.modules.quartz.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.quartz.domain.QuartzJob; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.quartz.utils.QuartzManage; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.quartz.service.QuartzJobService; import co.yixiang.modules.quartz.service.dto.QuartzJobDto; import co.yixiang.modules.quartz.service.dto.QuartzJobQueryCriteria; import co.yixiang.modules.quartz.service.mapper.QuartzJobMapper; +import co.yixiang.modules.quartz.utils.QuartzManage; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java index 8e9090e3..1f0e82ca 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java @@ -5,31 +5,33 @@ */ package co.yixiang.modules.quartz.service.impl; -import co.yixiang.modules.quartz.domain.QuartzLog; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.quartz.domain.QuartzLog; import co.yixiang.modules.quartz.service.QuartzLogService; import co.yixiang.modules.quartz.service.dto.QuartzLogDto; import co.yixiang.modules.quartz.service.dto.QuartzLogQueryCriteria; import co.yixiang.modules.quartz.service.mapper.QuartzLogMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java index b7ba4faf..a3242df0 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java @@ -7,17 +7,19 @@ package co.yixiang.modules.quartz.utils; import co.yixiang.config.thread.ThreadPoolExecutorUtil; import co.yixiang.modules.quartz.domain.QuartzJob; +import co.yixiang.modules.quartz.domain.QuartzLog; +import co.yixiang.modules.quartz.service.QuartzJobService; import co.yixiang.modules.quartz.service.QuartzLogService; import co.yixiang.utils.SpringContextHolder; import co.yixiang.utils.ThrowableUtil; -import co.yixiang.modules.quartz.domain.QuartzLog; -import co.yixiang.modules.quartz.service.QuartzJobService; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; -import java.util.concurrent.*; + +import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; /** * 参考人人开源，https://gitee.com/renrenio/renren-security diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java index 4d574de9..ac7bc371 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java @@ -8,11 +8,21 @@ package co.yixiang.modules.quartz.utils; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.quartz.domain.QuartzJob; import lombok.extern.slf4j.Slf4j; -import org.quartz.*; +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.JobBuilder; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.Trigger; +import org.quartz.TriggerKey; import org.quartz.impl.triggers.CronTriggerImpl; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import java.util.Date; + import static org.quartz.TriggerBuilder.newTrigger; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java index b3723e76..c6243998 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java @@ -9,6 +9,7 @@ import co.yixiang.utils.SpringContextHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.util.ReflectionUtils; + import java.lang.reflect.Method; import java.util.concurrent.Callable; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java b/yshop-system/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java index 8616f2c1..6cd0fccb 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java @@ -8,7 +8,6 @@ package co.yixiang.modules.security.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; /** * Jwt参数配置 diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthController.java index 1385dd2b..10a1e250 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -8,13 +8,9 @@ package co.yixiang.modules.security.rest; import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; -import com.wf.captcha.ArithmeticCaptcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.logging.aop.log.Log; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.security.config.SecurityProperties; import co.yixiang.modules.security.security.TokenProvider; import co.yixiang.modules.security.security.vo.AuthUser; @@ -23,6 +19,10 @@ import co.yixiang.modules.security.service.OnlineUserService; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; +import com.wf.captcha.ArithmeticCaptcha; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,7 +32,13 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +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.HashMap; import java.util.Map; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/rest/OnlineController.java b/yshop-system/src/main/java/co/yixiang/modules/security/rest/OnlineController.java index 8b1c2426..de393e1a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/rest/OnlineController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/rest/OnlineController.java @@ -13,7 +13,13 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenFilter.java b/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenFilter.java index 4b0d7bb5..4bade43a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenFilter.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenFilter.java @@ -6,15 +6,16 @@ package co.yixiang.modules.security.security; import co.yixiang.modules.security.config.SecurityProperties; +import co.yixiang.modules.security.security.vo.OnlineUser; import co.yixiang.modules.security.service.OnlineUserService; +import co.yixiang.utils.SpringContextHolder; import io.jsonwebtoken.ExpiredJwtException; import lombok.extern.slf4j.Slf4j; -import co.yixiang.modules.security.security.vo.OnlineUser; -import co.yixiang.utils.SpringContextHolder; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StringUtils; import org.springframework.web.filter.GenericFilterBean; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenProvider.java b/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenProvider.java index b8b3e995..63d3fe98 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenProvider.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/security/TokenProvider.java @@ -5,11 +5,16 @@ */ package co.yixiang.modules.security.security; -import io.jsonwebtoken.*; +import co.yixiang.modules.security.config.SecurityProperties; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import lombok.extern.slf4j.Slf4j; -import co.yixiang.modules.security.config.SecurityProperties; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -17,6 +22,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; import java.security.Key; import java.util.Arrays; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java b/yshop-system/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java index 010b7646..ef320c6b 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java @@ -10,6 +10,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; + import java.sql.Timestamp; import java.util.Collection; import java.util.Date; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java b/yshop-system/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java index b36a2a30..72ad784a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java @@ -6,17 +6,26 @@ package co.yixiang.modules.security.service; import co.yixiang.modules.security.config.SecurityProperties; -import co.yixiang.utils.*; -import lombok.extern.slf4j.Slf4j; import co.yixiang.modules.security.security.vo.JwtUser; import co.yixiang.modules.security.security.vo.OnlineUser; - +import co.yixiang.utils.EncryptUtils; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.RedisUtils; +import co.yixiang.utils.StringUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java index 062c2b78..e6a411dc 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java @@ -5,18 +5,19 @@ */ package co.yixiang.modules.security.service; -import co.yixiang.modules.system.service.UserService; -import co.yixiang.modules.system.service.dto.DeptSmallDto; -import co.yixiang.modules.system.service.dto.JobSmallDto; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.security.security.vo.JwtUser; import co.yixiang.modules.system.service.RoleService; +import co.yixiang.modules.system.service.UserService; +import co.yixiang.modules.system.service.dto.DeptSmallDto; +import co.yixiang.modules.system.service.dto.JobSmallDto; import co.yixiang.modules.system.service.dto.UserDto; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import java.util.Optional; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java index b7a78367..bdde72b5 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java @@ -7,15 +7,20 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java index 9c5a3c0f..c7f7214b 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java @@ -7,17 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.NotBlank; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java index 656b1ed1..a638678c 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java index db697416..9474425c 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java @@ -7,17 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.NotBlank; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java index bbb3abd4..79cdc450 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java @@ -7,16 +7,19 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; -import java.sql.Timestamp; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java index ad8dc30a..7279a19d 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java @@ -7,16 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; -import java.sql.Timestamp; + +import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Set; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java index 7b5ba95f..c6caac4b 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java @@ -7,10 +7,12 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java index 2afce733..e3da65a8 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java @@ -7,10 +7,12 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java index 33b908c4..e2582a99 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java @@ -7,17 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.NotBlank; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Set; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java index f5c8f46c..35be66e0 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java @@ -7,16 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; -import cn.hutool.core.util.ObjectUtil; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java index 1924cc95..30ccb4f7 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java @@ -7,10 +7,12 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.domain; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java index 945ec222..1a1725f1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java @@ -7,6 +7,7 @@ package co.yixiang.modules.system.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java index 03aa2105..ea46d319 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java @@ -6,15 +6,14 @@ package co.yixiang.modules.system.rest; import cn.hutool.core.collection.CollectionUtil; -import co.yixiang.logging.aop.log.Log; import co.yixiang.config.DataScope; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.Dept; import co.yixiang.modules.system.service.DeptService; import co.yixiang.modules.system.service.dto.DeptDto; import co.yixiang.modules.system.service.dto.DeptQueryCriteria; -import co.yixiang.utils.ThrowableUtil; import co.yixiang.utils.ValidationUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; @@ -23,12 +22,17 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java index e04cdd98..ba49efda 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java @@ -4,9 +4,10 @@ */ package co.yixiang.modules.system.rest; -import co.yixiang.logging.aop.log.Log; + import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.Dict; import co.yixiang.modules.system.service.DictService; import co.yixiang.modules.system.service.dto.DictDto; @@ -18,7 +19,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index f94fc6da..40d3ade5 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -5,8 +5,8 @@ */ package co.yixiang.modules.system.rest; -import co.yixiang.logging.aop.log.Log; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.DictDetail; import co.yixiang.modules.system.service.DictDetailService; import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; @@ -19,7 +19,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.Map; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java index 4723d6bb..e03322d2 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java @@ -5,15 +5,14 @@ */ package co.yixiang.modules.system.rest; -import co.yixiang.logging.aop.log.Log; import co.yixiang.config.DataScope; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.Job; import co.yixiang.modules.system.service.JobService; import co.yixiang.modules.system.service.dto.JobDto; import co.yixiang.modules.system.service.dto.JobQueryCriteria; -import co.yixiang.utils.ThrowableUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; @@ -21,7 +20,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java index f7197144..859ce510 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -5,11 +5,9 @@ */ package co.yixiang.modules.system.rest; -import co.yixiang.exception.EntityExistException; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.modules.shop.domain.YxSystemConfig; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.Menu; import co.yixiang.modules.system.service.MenuService; import co.yixiang.modules.system.service.RoleService; @@ -18,7 +16,6 @@ import co.yixiang.modules.system.service.dto.MenuDto; import co.yixiang.modules.system.service.dto.MenuQueryCriteria; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.utils.SecurityUtils; -import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,7 +23,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java index 092275cc..fcb07764 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java @@ -6,9 +6,9 @@ package co.yixiang.modules.system.rest; import cn.hutool.core.lang.Dict; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.Role; import co.yixiang.modules.system.service.RoleService; import co.yixiang.modules.system.service.UserService; @@ -17,7 +17,6 @@ import co.yixiang.modules.system.service.dto.RoleQueryCriteria; import co.yixiang.modules.system.service.dto.RoleSmallDto; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.utils.SecurityUtils; -import co.yixiang.utils.ThrowableUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; @@ -27,7 +26,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.HttpServletResponse; import java.io.IOException; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java index 5f50f6f1..a9ed5fc8 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java @@ -7,19 +7,19 @@ package co.yixiang.modules.system.rest; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; -import co.yixiang.logging.aop.log.Log; import co.yixiang.config.DataScope; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.modules.system.service.dto.UserDto; -import co.yixiang.tools.domain.VerificationCode; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.system.domain.User; import co.yixiang.modules.system.domain.vo.UserPassVo; import co.yixiang.modules.system.service.DeptService; import co.yixiang.modules.system.service.RoleService; import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.RoleSmallDto; +import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.modules.system.service.dto.UserQueryCriteria; +import co.yixiang.tools.domain.VerificationCode; import co.yixiang.tools.service.VerificationCodeService; import co.yixiang.utils.PageUtil; import co.yixiang.utils.SecurityUtils; @@ -35,7 +35,15 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java index 95af37b9..2b55d1fb 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java @@ -7,16 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.Dept; import co.yixiang.modules.system.service.dto.DeptDto; import co.yixiang.modules.system.service.dto.DeptQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import java.util.Set; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/DictDetailService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/DictDetailService.java index b321b947..f76e6900 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/DictDetailService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/DictDetailService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.DictDetail; import co.yixiang.modules.system.service.dto.DictDetailDto; import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/DictService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/DictService.java index c8ea206a..64652a37 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/DictService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/DictService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.Dict; import co.yixiang.modules.system.service.dto.DictDto; import co.yixiang.modules.system.service.dto.DictQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/JobService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/JobService.java index 5f3f351d..e9d334ce 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/JobService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/JobService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.Job; import co.yixiang.modules.system.service.dto.JobDto; import co.yixiang.modules.system.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/MenuService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/MenuService.java index 6fb9993f..c08cef32 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/MenuService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/MenuService.java @@ -7,6 +7,7 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.Menu; import co.yixiang.modules.system.domain.vo.MenuVo; @@ -14,11 +15,12 @@ import co.yixiang.modules.system.service.dto.MenuDto; import co.yixiang.modules.system.service.dto.MenuQueryCriteria; import co.yixiang.modules.system.service.dto.RoleSmallDto; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import java.util.Set; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java index bfa9ec87..de2ee1b9 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java @@ -7,6 +7,7 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.Role; import co.yixiang.modules.system.service.dto.RoleDto; @@ -16,12 +17,12 @@ import co.yixiang.modules.system.service.dto.UserDto; import org.springframework.data.domain.Pageable; import org.springframework.security.core.GrantedAuthority; -import java.util.Collection; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import java.util.Set; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java index b8151886..151cd028 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.UserAvatar; import co.yixiang.modules.system.service.dto.UserAvatarDto; import co.yixiang.modules.system.service.dto.UserAvatarQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserService.java index 2d182321..e43ceebb 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserService.java @@ -7,6 +7,7 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.system.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.system.domain.User; import co.yixiang.modules.system.service.dto.UserDto; @@ -14,11 +15,11 @@ import co.yixiang.modules.system.service.dto.UserQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import java.util.Set; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java index a933b18a..19ccb382 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; import java.util.List; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java index 179848df..bfc94043 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java @@ -8,14 +8,13 @@ */ package co.yixiang.modules.system.service.dto; +import co.yixiang.annotation.Query; import lombok.Data; import java.sql.Timestamp; import java.util.List; import java.util.Set; -import co.yixiang.annotation.Query; - /** * @author hupeng * @date 2020-05-14 diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java index c3a10d3e..fac35803 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java index ae886f44..b24db6f6 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java index c0997da4..270955d4 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java @@ -8,8 +8,8 @@ */ package co.yixiang.modules.system.service.dto; -import lombok.Data; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java index 2fd26ff9..628804e9 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; import java.util.List; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java index f63b1544..52f99f91 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java @@ -8,9 +8,8 @@ */ package co.yixiang.modules.system.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java index 8d595fa4..e76e7d53 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java @@ -7,6 +7,7 @@ package co.yixiang.modules.system.service.dto; import lombok.Getter; import lombok.Setter; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java index 2529d1e6..52e6fe3b 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java index 40193ebb..6e865c7a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java @@ -5,9 +5,10 @@ */ package co.yixiang.modules.system.service.dto; +import co.yixiang.annotation.Query; import lombok.Data; import lombok.NoArgsConstructor; -import co.yixiang.annotation.Query; + import java.sql.Timestamp; import java.util.List; import java.util.Set; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java index c1b84105..9c958b8d 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java @@ -7,6 +7,7 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; import lombok.NoArgsConstructor; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java index 18b61f76..96f63c9f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; import java.util.List; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java index 10e268bb..2846f1a1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java index 7c6f5b42..d4985cf8 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java @@ -10,8 +10,9 @@ package co.yixiang.modules.system.service.dto; import co.yixiang.modules.system.domain.Menu; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; import java.util.Set; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java index 8569c8e6..5ee90b48 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java index 93400948..20b38eb3 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java @@ -6,6 +6,7 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java index 56afc6ce..8452a9d2 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java index 34d825e1..989303b2 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.system.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java index 2c0f3b98..0b16c598 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java @@ -11,9 +11,9 @@ package co.yixiang.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; -import java.util.Date; +import java.sql.Timestamp; import java.util.Set; /** diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java index 7ba1c29e..a16f6a8a 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java @@ -8,14 +8,13 @@ */ package co.yixiang.modules.system.service.dto; +import co.yixiang.annotation.Query; import lombok.Data; import java.sql.Timestamp; import java.util.List; import java.util.Set; -import co.yixiang.annotation.Query; - /** * @author hupeng * @date 2020-05-14 diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java index e510620c..8b334c79 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java @@ -8,40 +8,38 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.Dept; import co.yixiang.common.service.impl.BaseServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.system.domain.Dept; import co.yixiang.modules.system.service.DeptService; import co.yixiang.modules.system.service.dto.DeptDto; import co.yixiang.modules.system.service.dto.DeptQueryCriteria; import co.yixiang.modules.system.service.mapper.DeptMapper; -import org.springframework.cache.annotation.Cacheable; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import org.springframework.util.CollectionUtils; - -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Set; -import java.util.stream.Collectors; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java index cbd866ee..6a7036ca 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java @@ -8,34 +8,32 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.DictDetail; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.modules.system.domain.DictDetail; import co.yixiang.modules.system.service.DictDetailService; import co.yixiang.modules.system.service.dto.DictDetailDto; import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; import co.yixiang.modules.system.service.mapper.DictDetailMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java index 04c2d512..3d4261be 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java @@ -8,34 +8,33 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.Dict; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.system.domain.Dict; import co.yixiang.modules.system.service.DictService; import co.yixiang.modules.system.service.dto.DictDto; import co.yixiang.modules.system.service.dto.DictQueryCriteria; import co.yixiang.modules.system.service.mapper.DictMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java index 7949fb99..c668eb26 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java @@ -8,35 +8,34 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.Job; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.system.service.DeptService; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.system.domain.Job; +import co.yixiang.modules.system.service.DeptService; import co.yixiang.modules.system.service.JobService; import co.yixiang.modules.system.service.dto.JobDto; import co.yixiang.modules.system.service.dto.JobQueryCriteria; import co.yixiang.modules.system.service.mapper.JobMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java index 357203f8..5af0ee8f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java @@ -10,49 +10,50 @@ package co.yixiang.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.system.domain.Menu; -import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.system.domain.vo.MenuMetaVo; import co.yixiang.modules.system.domain.vo.MenuVo; -import co.yixiang.modules.system.service.dto.RoleSmallDto; -import co.yixiang.modules.system.service.mapper.RoleMapper; -import co.yixiang.utils.StringUtils; -import co.yixiang.utils.ValidationUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import co.yixiang.modules.system.service.MenuService; import co.yixiang.modules.system.service.dto.MenuDto; import co.yixiang.modules.system.service.dto.MenuQueryCriteria; +import co.yixiang.modules.system.service.dto.RoleSmallDto; import co.yixiang.modules.system.service.mapper.MenuMapper; +import co.yixiang.modules.system.service.mapper.RoleMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.StringUtils; +import co.yixiang.utils.ValidationUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Set; -import java.util.stream.Collectors; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java index 342a6b93..f601b969 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java @@ -8,53 +8,54 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.exception.EntityExistException; -import co.yixiang.modules.system.domain.*; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.modules.system.service.*; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.EntityExistException; +import co.yixiang.modules.system.domain.Dept; +import co.yixiang.modules.system.domain.Menu; +import co.yixiang.modules.system.domain.Role; +import co.yixiang.modules.system.domain.RolesDepts; +import co.yixiang.modules.system.domain.RolesMenus; +import co.yixiang.modules.system.service.RoleService; +import co.yixiang.modules.system.service.RolesDeptsService; +import co.yixiang.modules.system.service.RolesMenusService; +import co.yixiang.modules.system.service.dto.RoleDto; +import co.yixiang.modules.system.service.dto.RoleQueryCriteria; import co.yixiang.modules.system.service.dto.RoleSmallDto; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.modules.system.service.mapper.DeptMapper; import co.yixiang.modules.system.service.mapper.MenuMapper; +import co.yixiang.modules.system.service.mapper.RoleMapper; +import co.yixiang.utils.FileUtil; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.R; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; -import co.yixiang.modules.system.service.dto.RoleDto; -import co.yixiang.modules.system.service.dto.RoleQueryCriteria; -import co.yixiang.modules.system.service.mapper.RoleMapper; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Set; -import java.util.stream.Collectors; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesDeptsServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesDeptsServiceImpl.java index ef311391..e9b43d2c 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesDeptsServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesDeptsServiceImpl.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.RolesDepts; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.system.domain.RolesDepts; import co.yixiang.modules.system.service.RolesDeptsService; import co.yixiang.modules.system.service.mapper.RolesDeptsMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesMenusServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesMenusServiceImpl.java index 5004612b..a2003996 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesMenusServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RolesMenusServiceImpl.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.RolesMenus; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.system.domain.RolesMenus; import co.yixiang.modules.system.service.RolesMenusService; import co.yixiang.modules.system.service.mapper.RolesMenusMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java index 916f9048..46336821 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java @@ -9,47 +9,51 @@ package co.yixiang.modules.system.service.impl; import cn.hutool.core.date.DateUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.system.domain.Role; import co.yixiang.modules.system.domain.User; -import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.system.domain.UserAvatar; import co.yixiang.modules.system.domain.UsersRoles; -import co.yixiang.modules.system.service.*; +import co.yixiang.modules.system.service.DeptService; +import co.yixiang.modules.system.service.JobService; +import co.yixiang.modules.system.service.UserAvatarService; +import co.yixiang.modules.system.service.UserService; +import co.yixiang.modules.system.service.UsersRolesService; +import co.yixiang.modules.system.service.dto.UserDto; +import co.yixiang.modules.system.service.dto.UserQueryCriteria; import co.yixiang.modules.system.service.mapper.RoleMapper; +import co.yixiang.modules.system.service.mapper.SysUserMapper; +import co.yixiang.utils.FileUtil; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; import co.yixiang.utils.ValidationUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; -import co.yixiang.modules.system.service.dto.UserDto; -import co.yixiang.modules.system.service.dto.UserQueryCriteria; -import co.yixiang.modules.system.service.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cache.annotation.CacheEvict; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Set; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java index 5c3eba8c..f8afa29f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java @@ -8,34 +8,33 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.UserAvatar; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.system.domain.UserAvatar; import co.yixiang.modules.system.service.UserAvatarService; import co.yixiang.modules.system.service.dto.UserAvatarDto; import co.yixiang.modules.system.service.dto.UserAvatarQueryCriteria; import co.yixiang.modules.system.service.mapper.UserAvatarMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UsersRolesServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UsersRolesServiceImpl.java index f45f108d..43a80f73 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UsersRolesServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UsersRolesServiceImpl.java @@ -8,11 +8,11 @@ */ package co.yixiang.modules.system.service.impl; -import co.yixiang.modules.system.domain.UsersRoles; import co.yixiang.common.service.impl.BaseServiceImpl; -import lombok.AllArgsConstructor; +import co.yixiang.modules.system.domain.UsersRoles; import co.yixiang.modules.system.service.UsersRolesService; import co.yixiang.modules.system.service.mapper.UsersRolesMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DeptMapper.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DeptMapper.java index 9c42db33..76762115 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DeptMapper.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DeptMapper.java @@ -13,7 +13,6 @@ import co.yixiang.modules.system.domain.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; import java.util.Set; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java index 7a776f43..100b4afe 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java @@ -10,7 +10,6 @@ package co.yixiang.modules.system.service.mapper; import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.system.domain.DictDetail; -import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java index 9baea40d..479707a0 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/SysUserMapper.java @@ -16,8 +16,6 @@ import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; -import java.util.Date; - /** * @author hupeng * @date 2020-05-14 diff --git a/yshop-system/src/test/java/co/yixiang/Api_java_demo.java b/yshop-system/src/test/java/co/yixiang/Api_java_demo.java index 4c198a47..6384faca 100644 --- a/yshop-system/src/test/java/co/yixiang/Api_java_demo.java +++ b/yshop-system/src/test/java/co/yixiang/Api_java_demo.java @@ -4,9 +4,7 @@ */ package co.yixiang; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; @@ -19,6 +17,10 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + /** * @author ：LionCity * @date ：Created in 2020-04-01 10:47 diff --git a/yshop-system/src/test/java/co/yixiang/PrintUtil4.java b/yshop-system/src/test/java/co/yixiang/PrintUtil4.java index 110ae0b3..42e277ec 100644 --- a/yshop-system/src/test/java/co/yixiang/PrintUtil4.java +++ b/yshop-system/src/test/java/co/yixiang/PrintUtil4.java @@ -5,14 +5,6 @@ */ package co.yixiang; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; @@ -25,6 +17,14 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + @SuppressWarnings("static-access") public class PrintUtil4 { static PrintUtil4 p = new PrintUtil4(); diff --git a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java index 0f64e355..65176f57 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java @@ -8,6 +8,7 @@ package co.yixiang.tools.config; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; + import javax.servlet.MultipartConfigElement; import java.io.File; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java index d0e30aa9..b53eec2b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java @@ -4,11 +4,13 @@ */ package co.yixiang.tools.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; + import java.io.Serializable; /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java index 5221cdd3..2d0bab70 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java @@ -4,11 +4,12 @@ */ package co.yixiang.tools.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import java.io.Serializable; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java index 59310437..5ab8dcf1 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java @@ -4,18 +4,18 @@ */ package co.yixiang.tools.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; import lombok.Setter; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java index 1986d477..ecbd34c8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java @@ -4,16 +4,17 @@ */ package co.yixiang.tools.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java index 5e0f38c3..d48d42a0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java @@ -4,13 +4,13 @@ */ package co.yixiang.tools.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; import java.io.Serializable; /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java index 8d387417..f5a49d8b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java @@ -4,16 +4,17 @@ */ package co.yixiang.tools.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import java.sql.Timestamp; import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java index 939d3708..88fd2453 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.sql.Timestamp; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java index 9d488c75..e0c76e97 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java @@ -5,21 +5,27 @@ */ package co.yixiang.tools.rest; +import co.yixiang.annotation.AnonymousAccess; import co.yixiang.logging.aop.log.Log; +import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.tools.domain.vo.TradeVo; import co.yixiang.tools.service.AlipayConfigService; import co.yixiang.tools.utils.AliPayStatusEnum; +import co.yixiang.tools.utils.AlipayUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.utils.AlipayUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java index 7d03f9b7..62983cfe 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java @@ -6,15 +6,20 @@ package co.yixiang.tools.rest; import co.yixiang.logging.aop.log.Log; +import co.yixiang.tools.domain.EmailConfig; +import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.tools.service.EmailConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.domain.EmailConfig; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 发送邮件 diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java index 1887e25a..9139f556 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java @@ -4,25 +4,33 @@ */ package co.yixiang.tools.rest; -import java.util.Arrays; + import co.yixiang.dozer.service.IGenerator; -import lombok.AllArgsConstructor; import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.domain.LocalStorage; import co.yixiang.tools.service.LocalStorageService; -import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; import co.yixiang.tools.service.dto.LocalStorageDto; +import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Arrays; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java index ee38e0fa..f1b69272 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java @@ -5,21 +5,28 @@ */ package co.yixiang.tools.rest; -import co.yixiang.tools.service.dto.PictureDto; -import co.yixiang.logging.aop.log.Log; import co.yixiang.dozer.service.IGenerator; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import co.yixiang.logging.aop.log.Log; import co.yixiang.tools.domain.Picture; import co.yixiang.tools.service.PictureService; +import co.yixiang.tools.service.dto.PictureDto; import co.yixiang.tools.service.dto.PictureQueryCriteria; import co.yixiang.utils.SecurityUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java index 7b9f48c2..147652cf 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java @@ -17,7 +17,15 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java index e9ce2fa8..1e854c74 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java @@ -16,7 +16,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.util.HashMap; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java b/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java index a3b0e8a6..26cbbd37 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java @@ -5,16 +5,21 @@ */ package co.yixiang.tools.rest; +import co.yixiang.tools.domain.VerificationCode; +import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.tools.service.EmailConfigService; +import co.yixiang.tools.service.VerificationCodeService; import co.yixiang.utils.YshopConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import co.yixiang.tools.domain.VerificationCode; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.service.VerificationCodeService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java index 3f68b8f9..daa8d05d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java @@ -4,9 +4,10 @@ */ package co.yixiang.tools.service; + +import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.AlipayConfig; import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.common.service.BaseService; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java index f977b13f..0967acf0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java @@ -4,9 +4,10 @@ */ package co.yixiang.tools.service; + +import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.EmailConfig; import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.common.service.BaseService; import org.springframework.scheduling.annotation.Async; /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java index 95fe6bcb..b37412e2 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java @@ -4,17 +4,18 @@ */ package co.yixiang.tools.service; + +import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.LocalStorage; import co.yixiang.tools.service.dto.LocalStorageDto; -import co.yixiang.common.service.BaseService; import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; -import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java index e2f417c9..35e26bd8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java @@ -4,17 +4,18 @@ */ package co.yixiang.tools.service; + +import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.Picture; import co.yixiang.tools.service.dto.PictureDto; -import co.yixiang.common.service.BaseService; import co.yixiang.tools.service.dto.PictureQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; -import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java index ef4f14c1..dce9167b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java @@ -4,15 +4,17 @@ */ package co.yixiang.tools.service; + import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.QiniuConfig; import co.yixiang.tools.service.dto.QiniuConfigDto; import co.yixiang.tools.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java index fd783ddf..aa697347 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java @@ -4,15 +4,17 @@ */ package co.yixiang.tools.service; -import co.yixiang.tools.service.dto.QiniuContentDto; + import co.yixiang.common.service.BaseService; import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.tools.service.dto.QiniuContentDto; import co.yixiang.tools.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; + import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java index 7b7de15c..9882940a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java @@ -6,8 +6,9 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java index 988c354a..968d85e8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java @@ -5,11 +5,11 @@ */ package co.yixiang.tools.service.dto; +import co.yixiang.annotation.Query; import lombok.Data; import java.sql.Timestamp; import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java index 0858ce0d..10d3f9a8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java @@ -6,8 +6,9 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java index 76ba8785..a0c8329f 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java index b6d4ed73..38791f7a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java @@ -6,6 +6,7 @@ package co.yixiang.tools.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java index 3d7b4a29..2a9d7014 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java index c7939105..235b782a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java @@ -6,8 +6,9 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java index fbe4ddcf..ee5c1b26 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java @@ -6,8 +6,6 @@ package co.yixiang.tools.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java index ad7ae199..879a7358 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java @@ -5,8 +5,8 @@ */ package co.yixiang.tools.service.dto; -import lombok.Data; import co.yixiang.annotation.Query; +import lombok.Data; import java.sql.Timestamp; import java.util.List; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java index 9438d338..8047babd 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java @@ -5,12 +5,12 @@ */ package co.yixiang.tools.service.impl; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.exception.BadRequestException; import co.yixiang.tools.domain.AlipayConfig; import co.yixiang.tools.domain.vo.TradeVo; import co.yixiang.tools.service.AlipayConfigService; import co.yixiang.tools.service.mapper.AlipayConfigMapper; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.exception.BadRequestException; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java index c8230c61..212ae2b4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java @@ -7,15 +7,15 @@ package co.yixiang.tools.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.BadRequestException; import co.yixiang.tools.domain.EmailConfig; import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.tools.service.EmailConfigService; import co.yixiang.tools.service.mapper.EmailConfigMapper; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.exception.BadRequestException; -import co.yixiang.utils.*; +import co.yixiang.utils.EncryptUtils; import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java index 0923493a..64c184f0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java @@ -6,36 +6,39 @@ package co.yixiang.tools.service.impl; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.tools.domain.LocalStorage; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.exception.BadRequestException; -import co.yixiang.utils.*; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.BadRequestException; +import co.yixiang.tools.domain.LocalStorage; import co.yixiang.tools.service.LocalStorageService; import co.yixiang.tools.service.dto.LocalStorageDto; import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; import co.yixiang.tools.service.mapper.LocalStorageMapper; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.SecurityUtils; +import co.yixiang.utils.StringUtils; +import com.github.pagehelper.PageInfo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java index 03070d28..a6c8fec8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java @@ -9,37 +9,42 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.BadRequestException; import co.yixiang.tools.domain.Picture; import co.yixiang.tools.service.PictureService; import co.yixiang.tools.service.dto.PictureDto; import co.yixiang.tools.service.dto.PictureQueryCriteria; import co.yixiang.tools.service.mapper.PictureMapper; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.exception.BadRequestException; -import co.yixiang.dozer.service.IGenerator; +import co.yixiang.utils.FileUtil; import co.yixiang.utils.TranslatorUtil; import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.YshopConstant; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.util.*; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java index 486dd01e..a39f71f5 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java @@ -5,6 +5,8 @@ */ package co.yixiang.tools.service.impl; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.exception.BadRequestException; import co.yixiang.tools.domain.QiniuConfig; import co.yixiang.tools.domain.QiniuContent; import co.yixiang.tools.service.QiNiuService; @@ -12,7 +14,7 @@ import co.yixiang.tools.service.QiniuConfigService; import co.yixiang.tools.service.QiniuContentService; import co.yixiang.tools.service.dto.QiniuQueryCriteria; import co.yixiang.tools.utils.QiNiuUtil; -import co.yixiang.dozer.service.IGenerator; +import co.yixiang.utils.FileUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiniu.common.QiniuException; @@ -23,17 +25,19 @@ import com.qiniu.storage.UploadManager; import com.qiniu.storage.model.DefaultPutRet; import com.qiniu.storage.model.FileInfo; import com.qiniu.util.Auth; -import co.yixiang.exception.BadRequestException; -import co.yixiang.utils.FileUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java index bb0e938b..c710bdc7 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.tools.service.impl; -import co.yixiang.tools.service.QiniuConfigService; -import co.yixiang.tools.domain.QiniuConfig; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.tools.service.QiniuConfigService; import co.yixiang.tools.service.dto.QiniuConfigDto; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import co.yixiang.tools.service.mapper.QiniuConfigMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java index 182a8cd7..aba56b9b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java @@ -5,32 +5,33 @@ */ package co.yixiang.tools.service.impl; -import co.yixiang.tools.service.dto.QiniuContentDto; -import co.yixiang.tools.domain.QiniuContent; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; -import lombok.AllArgsConstructor; -import co.yixiang.dozer.service.IGenerator; -import com.github.pagehelper.PageInfo; import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; +import co.yixiang.dozer.service.IGenerator; +import co.yixiang.tools.domain.QiniuContent; import co.yixiang.tools.service.QiniuContentService; +import co.yixiang.tools.service.dto.QiniuContentDto; +import co.yixiang.tools.service.dto.QiniuQueryCriteria; import co.yixiang.tools.service.mapper.QiniuContentMapper; +import co.yixiang.utils.FileUtil; +import com.github.pagehelper.PageInfo; +import lombok.AllArgsConstructor; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; //import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java index 5d95de92..1c7ef939 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java @@ -11,19 +11,22 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.exception.BadRequestException; import co.yixiang.tools.domain.VerificationCode; import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.tools.service.VerificationCodeService; import co.yixiang.tools.service.mapper.VerificationCodeMapper; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.exception.BadRequestException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import java.util.Collections; -import java.util.concurrent.*; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java index 0fdb5b1f..e8f644ae 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java @@ -5,8 +5,8 @@ */ package co.yixiang.tools.service.mapper; -import co.yixiang.tools.domain.EmailConfig; import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.tools.domain.EmailConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java index 7f92cb24..1b018143 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java @@ -5,8 +5,8 @@ */ package co.yixiang.tools.service.mapper; -import co.yixiang.tools.domain.LocalStorage; import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.tools.domain.LocalStorage; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java index 29d31260..890e2edc 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java @@ -9,6 +9,7 @@ import co.yixiang.tools.domain.AlipayConfig; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.Date;