From a1d193932daeb074e969f958ace9b861ab1ed9c0 Mon Sep 17 00:00:00 2001 From: taochengbo <552920369@qq.com> Date: Fri, 21 Aug 2020 22:00:19 +0800 Subject: [PATCH] =?UTF-8?q?bug--=E5=AF=BC=E5=85=A5=E5=8C=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/config/VisitsInitialization.java | 3 +- .../modules/quartz/domain/QuartzJob.java | 5 --- .../modules/quartz/domain/QuartzLog.java | 5 --- .../service/impl/QuartzJobServiceImpl.java | 5 ++- .../modules/security/rest/AuthController.java | 7 ++- .../yixiang/modules/system/domain/Dept.java | 4 -- .../yixiang/modules/system/domain/Dict.java | 5 --- .../modules/system/domain/DictDetail.java | 4 -- .../co/yixiang/modules/system/domain/Job.java | 3 -- .../yixiang/modules/system/domain/Menu.java | 4 -- .../yixiang/modules/system/domain/Role.java | 3 -- .../yixiang/modules/system/domain/User.java | 4 -- .../modules/system/service/RoleService.java | 1 - .../system/service/impl/JobServiceImpl.java | 2 - .../system/service/impl/RoleServiceImpl.java | 16 +++++-- .../co/yixiang/common/bean/LocalUser.java | 1 + .../yixiang/common/config/FilterConfig.java | 1 - .../handler/GlobalExceptionHandler.java | 10 +++-- .../java/co/yixiang/common/util/JwtToken.java | 6 ++- .../activity/rest/StoreBargainController.java | 15 ++++++- .../rest/StoreCombinationController.java | 7 ++- .../activity/rest/StoreSeckillController.java | 12 ++--- .../modules/auth/rest/AuthController.java | 9 ++-- .../modules/coupon/rest/CouponController.java | 7 ++- .../modules/manage/param/OrderPriceParam.java | 1 - .../modules/manage/rest/ShoperController.java | 12 +++-- .../order/param/ComputeOrderParam.java | 2 - .../order/rest/StoreOrderController.java | 19 +++++++- .../product/rest/StoreProductController.java | 9 +++- .../services/CreatShareProductService.java | 4 -- .../modules/services/OrderSupplyService.java | 12 +++-- .../modules/shop/rest/ArticleController.java | 7 ++- .../modules/shop/rest/IndexController.java | 4 -- .../user/rest/UserAddressController.java | 16 +++---- .../modules/user/rest/UserBillController.java | 7 ++- .../modules/user/rest/UserController.java | 8 ++-- .../user/rest/UserLevelController.java | 2 - .../user/rest/UserRechargeController.java | 2 - .../rest/controller/WechatController.java | 7 +-- .../rest/controller/WxMaUserController.java | 5 --- .../co/yixiang/annotation/DataSource.java | 6 ++- .../java/co/yixiang/annotation/Query.java | 5 --- .../java/co/yixiang/domain/BaseDomain.java | 4 +- .../main/java/co/yixiang/enums/PinkEnum.java | 2 - .../java/co/yixiang/event/TemplateBean.java | 6 ++- .../java/co/yixiang/utils/RedisUtils.java | 7 ++- .../co/yixiang/utils/html/HTMLFilter.java | 8 +++- .../main/java/co/yixiang/xss/XssFilter.java | 12 +++-- .../java/co/yixiang/logging/domain/Log.java | 4 -- .../activity/domain/YxStoreBargain.java | 6 ++- .../activity/domain/YxStoreCombination.java | 6 ++- .../activity/domain/YxStoreCouponUser.java | 6 ++- .../modules/activity/domain/YxStorePink.java | 6 ++- .../activity/domain/YxStoreSeckill.java | 6 ++- .../service/YxStoreBargainService.java | 3 +- .../service/YxStoreCombinationService.java | 2 +- .../activity/service/YxStorePinkService.java | 4 +- .../service/YxStoreSeckillService.java | 2 +- .../activity/service/dto/PinkUserDto.java | 6 ++- .../service/dto/YxStoreCombinationDto.java | 1 - .../service/dto/YxStoreCouponIssueDto.java | 1 - .../impl/YxStoreBargainServiceImpl.java | 6 ++- .../impl/YxStoreCombinationServiceImpl.java | 8 +++- .../impl/YxStoreCouponServiceImpl.java | 6 ++- .../impl/YxStoreCouponUserServiceImpl.java | 8 +++- .../service/impl/YxStorePinkServiceImpl.java | 12 ++++- .../impl/YxStoreSeckillServiceImpl.java | 9 ++-- .../impl/YxUserExtractServiceImpl.java | 6 ++- .../modules/activity/vo/BargainVo.java | 1 - .../modules/activity/vo/PinkInfoVo.java | 2 - .../activity/vo/StoreCombinationVo.java | 3 +- .../modules/activity/vo/StoreSeckillVo.java | 3 +- .../vo/YxStoreBargainUserQueryVo.java | 3 +- .../vo/YxStoreCombinationQueryVo.java | 1 - .../modules/cart/domain/YxStoreCart.java | 6 ++- .../service/impl/YxStoreCartServiceImpl.java | 7 ++- .../service/YxStoreCategoryService.java | 1 - .../impl/YxStoreCategoryServiceImpl.java | 7 ++- .../modules/order/domain/YxStoreOrder.java | 6 ++- .../order/service/YxExpressService.java | 1 - .../service/YxStoreOrderCartInfoService.java | 1 - .../order/service/YxStoreOrderService.java | 7 ++- .../service/YxStoreOrderStatusService.java | 1 - .../modules/order/service/dto/CacheDto.java | 1 - .../order/service/dto/TemplateDto.java | 6 ++- .../service/impl/YxExpressServiceImpl.java | 1 - .../impl/YxStoreOrderCartInfoServiceImpl.java | 1 - .../service/impl/YxStoreOrderServiceImpl.java | 44 ++++++++++++++++--- .../service/mapper/StoreOrderMapper.java | 1 - .../modules/order/vo/ConfirmOrderVo.java | 2 - .../modules/order/vo/UserOrderCountVo.java | 6 ++- .../product/domain/YxStoreProduct.java | 12 ++++- .../domain/YxStoreProductAttrValue.java | 6 ++- .../domain/YxStoreProductRelation.java | 6 ++- .../product/domain/YxStoreProductReply.java | 6 ++- .../service/YxStoreProductReplyService.java | 3 +- .../service/YxStoreProductRuleService.java | 7 +-- .../product/service/dto/FromatDetailDto.java | 6 ++- .../product/service/dto/ProductFormatDto.java | 6 ++- .../service/dto/YxStoreProductRuleDto.java | 3 +- .../dto/YxStoreProductRuleQueryCriteria.java | 2 - .../impl/YxStoreProductAttrServiceImpl.java | 7 ++- .../impl/YxStoreProductReplyServiceImpl.java | 3 +- .../impl/YxStoreProductServiceImpl.java | 28 ++++++++++-- .../mapper/StoreProductAttrValueMapper.java | 1 - .../yixiang/modules/product/vo/ProductVo.java | 6 --- .../modules/product/vo/ReplyCountVo.java | 6 ++- .../product/vo/YxSystemStoreQueryVo.java | 1 - .../shop/domain/YxSystemAttachment.java | 6 ++- .../shop/domain/YxSystemGroupData.java | 6 ++- .../shop/service/dto/YxMaterialDto.java | 1 - .../shop/service/dto/YxMaterialGroupDto.java | 1 - .../impl/YxSystemStoreServiceImpl.java | 1 - .../modules/shop/vo/YxSystemGroupDataVo.java | 8 +--- .../domain/YxShippingTemplatesFree.java | 12 ++--- .../domain/YxShippingTemplatesRegion.java | 12 ++--- .../modules/template/domain/YxSystemCity.java | 15 ++++--- .../YxShippingTemplatesFreeService.java | 8 ++-- .../YxShippingTemplatesRegionService.java | 8 ++-- .../service/YxShippingTemplatesService.java | 8 ++-- .../template/service/YxSystemCityService.java | 8 ++-- .../service/dto/YxShippingTemplatesDto.java | 3 +- .../dto/YxShippingTemplatesFreeDto.java | 3 +- .../YxShippingTemplatesFreeQueryCriteria.java | 2 - .../dto/YxShippingTemplatesQueryCriteria.java | 2 - .../dto/YxShippingTemplatesRegionDto.java | 3 +- ...xShippingTemplatesRegionQueryCriteria.java | 2 - .../template/service/dto/YxSystemCityDto.java | 1 + .../dto/YxSystemCityQueryCriteria.java | 2 - .../impl/YxShippingTemplatesServiceImpl.java | 8 +++- .../yixiang/modules/user/domain/YxUser.java | 13 ++++-- .../modules/user/domain/YxUserAddress.java | 6 ++- .../modules/user/domain/YxUserBill.java | 6 ++- .../modules/user/domain/YxUserSign.java | 6 ++- .../service/YxSystemUserLevelService.java | 1 - .../user/service/YxSystemUserTaskService.java | 1 - .../user/service/YxUserBillService.java | 3 +- .../modules/user/service/YxUserService.java | 1 - .../user/service/dto/WechatUserDto.java | 6 ++- .../impl/YxSystemUserLevelServiceImpl.java | 6 ++- .../impl/YxSystemUserTaskServiceImpl.java | 1 - .../impl/YxUserAddressServiceImpl.java | 1 - .../service/impl/YxUserBillServiceImpl.java | 12 +++-- .../service/impl/YxUserLevelServiceImpl.java | 2 - .../impl/YxUserRechargeServiceImpl.java | 6 ++- .../user/service/impl/YxUserServiceImpl.java | 8 +++- .../user/service/mapper/UserBillMapper.java | 5 ++- .../user/service/mapper/UserMapper.java | 1 - .../service/mapper/YxUserLevelMapper.java | 1 - .../modules/wechat/domain/YxWechatLive.java | 11 +++-- .../wechat/domain/YxWechatLiveGoods.java | 10 +++-- .../wechat/service/YxArticleService.java | 2 - .../service/YxWechatLiveGoodsService.java | 8 ++-- .../wechat/service/YxWechatLiveService.java | 8 ++-- .../wechat/service/YxWechatMenuService.java | 1 - .../wechat/service/YxWechatReplyService.java | 1 - .../service/YxWechatTemplateService.java | 1 - .../wechat/service/dto/YxWechatLiveDto.java | 8 ++-- .../service/dto/YxWechatLiveGoodsDto.java | 5 ++- .../dto/YxWechatLiveGoodsQueryCriteria.java | 3 +- .../dto/YxWechatLiveQueryCriteria.java | 2 - .../service/impl/WxMaLiveServiceImpl.java | 6 --- .../impl/YxWechatLiveGoodsServiceImpl.java | 28 +++++------- .../service/impl/YxWechatLiveServiceImpl.java | 33 +++++++------- .../service/impl/YxWechatMenuServiceImpl.java | 2 - .../impl/YxWechatReplyServiceImpl.java | 2 - .../impl/YxWechatTemplateServiceImpl.java | 2 - .../mapper/YxWechatLiveGoodsMapper.java | 1 - .../service/mapper/YxWechatLiveMapper.java | 1 - .../listener/RedisKeyExpirationListener.java | 2 - .../yixiang/message/rocketmq/MqConsumer.java | 6 --- .../yixiang/message/rocketmq/MqProducer.java | 2 - .../yixiang/common/utils/QueryHelpPlus.java | 6 ++- .../java/co/yixiang/config/MetaHandler.java | 1 - .../activity/rest/StoreBargainController.java | 1 - .../rest/StoreCombinationController.java | 7 ++- .../activity/rest/StoreCouponController.java | 1 - .../rest/StoreCouponIssueController.java | 2 - .../rest/StoreCouponIssueUserController.java | 5 --- .../activity/rest/StoreSeckillController.java | 1 - .../activity/rest/UserExtractController.java | 6 ++- .../modules/aop/ForbidSubmitAspect.java | 2 - .../rest/StoreCategoryController.java | 10 ++++- .../order/rest/StoreOrderController.java | 10 ++++- .../product/rest/StoreProductController.java | 19 +++++--- .../rest/StoreProductRuleController.java | 22 +++++++--- .../services/WechatArticleService.java | 6 ++- .../modules/shop/rest/ExpressController.java | 1 - .../shop/rest/SystemConfigController.java | 2 +- .../shop/rest/SystemGroupDataController.java | 1 - .../shop/rest/SystemStoreController.java | 1 - .../rest/ShippingTemplatesController.java | 21 ++++++--- .../modules/user/rest/MemberController.java | 9 +++- .../user/rest/SystemUserLevelController.java | 1 - .../modules/user/rest/UserBillController.java | 1 - .../user/rest/UserRechargeController.java | 4 -- .../wechat/rest/WechatArticleController.java | 3 -- .../wechat/rest/WechatMenuController.java | 1 - .../wechat/rest/WechatTemplateController.java | 11 +++-- .../wechat/rest/YxWechatLiveController.java | 21 ++++++--- .../rest/YxWechatLiveGoodsController.java | 24 ++++++---- .../tools/config/WxMaConfiguration.java | 5 --- .../yixiang/tools/rest/UploadController.java | 2 - .../service/impl/LocalStorageServiceImpl.java | 1 - .../yixiang/mp/config/WxMpConfiguration.java | 11 ++++- .../yixiang/mp/service/WeixinPayService.java | 6 ++- 206 files changed, 740 insertions(+), 471 deletions(-) diff --git a/yshop-admin/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java b/yshop-admin/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java index 9ffb11c2..9abe0e0f 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java @@ -3,7 +3,6 @@ package co.yixiang.modules.monitor.config; import co.yixiang.modules.monitor.service.VisitsService; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; /** * 初始化站点统计 @@ -24,4 +23,4 @@ public class VisitsInitialization implements ApplicationRunner { visitsService.save(); System.out.println("--------------- 初始化站点统计完成 ---------------"); } -} \ No newline at end of file +} diff --git a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java index 33c132ff..f77dffdd 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java @@ -8,16 +8,11 @@ package co.yixiang.modules.quartz.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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 lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.sql.Timestamp; - /** * @author hupeng * @date 2020-05-13 diff --git a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java index 9bef1966..aca83964 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java @@ -8,15 +8,10 @@ package co.yixiang.modules.quartz.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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.sql.Timestamp; - /** * @author hupeng * @date 2020-05-13 diff --git a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java index ab441028..d24fb912 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -24,7 +24,10 @@ import org.springframework.transaction.annotation.Transactional; 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; // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java index 4ed1cf83..8931e86f 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -32,7 +32,12 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; 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; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java index 4664bea5..fd4e1646 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java @@ -11,9 +11,7 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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; @@ -21,8 +19,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java index 2168dd17..65c4af22 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java @@ -11,17 +11,12 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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 com.fasterxml.jackson.databind.JsonSerializable; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java index 9f051a15..79af6180 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java @@ -11,15 +11,11 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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.sql.Timestamp; - /** * @author hupeng * @date 2020-05-14 diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java index c561fbde..b87d0de2 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java @@ -11,7 +11,6 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,8 +18,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java index 4b74ad5b..0b33ebd2 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java @@ -11,8 +11,6 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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; @@ -20,8 +18,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java index 087c393a..79863673 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java @@ -11,7 +11,6 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,8 +18,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.sql.Timestamp; import java.util.Set; /** diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java index c5a0658c..c83739e9 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java @@ -11,17 +11,13 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; -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 lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotBlank; -import java.io.Serializable; import java.sql.Timestamp; import java.util.Objects; import java.util.Set; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java index 5e0cb376..babbba64 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java @@ -15,7 +15,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 org.springframework.data.domain.Pageable; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java index 4854f00e..b92f1d07 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java @@ -10,7 +10,6 @@ package co.yixiang.modules.system.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; - import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.system.domain.Job; import co.yixiang.modules.system.service.DeptService; @@ -18,7 +17,6 @@ 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; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java index 316608b7..844e8b30 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java @@ -12,7 +12,11 @@ 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.*; +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; @@ -30,7 +34,6 @@ 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.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -38,7 +41,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +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; // 默认不使用缓存 diff --git a/yshop-app/src/main/java/co/yixiang/common/bean/LocalUser.java b/yshop-app/src/main/java/co/yixiang/common/bean/LocalUser.java index bdf28a7b..207d9e28 100644 --- a/yshop-app/src/main/java/co/yixiang/common/bean/LocalUser.java +++ b/yshop-app/src/main/java/co/yixiang/common/bean/LocalUser.java @@ -10,6 +10,7 @@ package co.yixiang.common.bean; import co.yixiang.modules.user.domain.YxUser; + import java.util.HashMap; import java.util.Map; diff --git a/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java index 73ff5294..fff3e25b 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java @@ -1,7 +1,6 @@ package co.yixiang.common.config; import cn.hutool.core.util.StrUtil; - import co.yixiang.xss.XssFilter; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java b/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java index 0299a4dd..48769caf 100644 --- a/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java +++ b/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java @@ -9,11 +9,13 @@ package co.yixiang.common.handler; -import co.yixiang.api.*; - - +import co.yixiang.api.ApiCode; +import co.yixiang.api.ApiResult; +import co.yixiang.api.BusinessException; +import co.yixiang.api.DaoException; +import co.yixiang.api.UnAuthenticatedException; +import co.yixiang.api.YshopException; import co.yixiang.common.bean.RequestDetail; - import co.yixiang.common.util.RequestDetailThreadLocal; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-app/src/main/java/co/yixiang/common/util/JwtToken.java b/yshop-app/src/main/java/co/yixiang/common/util/JwtToken.java index dece6746..2217341a 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/JwtToken.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/JwtToken.java @@ -18,7 +18,11 @@ import com.auth0.jwt.interfaces.DecodedJWT; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * @ClassName JwtToken diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 95f2db18..0bbcb7d7 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -25,7 +25,12 @@ import co.yixiang.modules.activity.param.YxStoreBargainUserQueryParam; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.YxStoreBargainUserHelpService; import co.yixiang.modules.activity.service.YxStoreBargainUserService; -import co.yixiang.modules.activity.vo.*; +import co.yixiang.modules.activity.vo.BargainCountVo; +import co.yixiang.modules.activity.vo.BargainVo; +import co.yixiang.modules.activity.vo.TopCountVo; +import co.yixiang.modules.activity.vo.YxStoreBargainQueryVo; +import co.yixiang.modules.activity.vo.YxStoreBargainUserHelpQueryVo; +import co.yixiang.modules.activity.vo.YxStoreBargainUserQueryVo; import co.yixiang.modules.services.CreatShareProductService; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.domain.YxUser; @@ -38,7 +43,13 @@ import lombok.RequiredArgsConstructor; 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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 6d13f2f3..725937f5 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -34,7 +34,12 @@ 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.util.List; import java.util.Map; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index ffa20226..f73921ff 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -11,18 +11,16 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; - import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; -import co.yixiang.modules.activity.service.dto.SeckillTimeDto; import co.yixiang.modules.activity.service.YxStoreSeckillService; - +import co.yixiang.modules.activity.service.dto.SeckillTimeDto; +import co.yixiang.modules.activity.vo.SeckillConfigVo; import co.yixiang.modules.activity.vo.StoreSeckillVo; import co.yixiang.modules.activity.vo.YxStoreSeckillQueryVo; -import co.yixiang.modules.activity.vo.SeckillConfigVo; import co.yixiang.modules.product.service.YxStoreProductRelationService; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; @@ -35,7 +33,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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java b/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java index 14d5a74f..58a2bc52 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java @@ -12,9 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import co.yixiang.api.ApiCode; import co.yixiang.api.ApiResult; -import co.yixiang.api.UnAuthenticatedException; import co.yixiang.api.YshopException; import co.yixiang.common.enums.SmsTypeEnum; import co.yixiang.common.util.JwtToken; @@ -38,9 +36,12 @@ 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.util.StringUtils; 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.util.HashMap; diff --git a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java index cc6ee021..3d6310fd 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java @@ -26,7 +26,12 @@ 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.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/param/OrderPriceParam.java b/yshop-app/src/main/java/co/yixiang/modules/manage/param/OrderPriceParam.java index 7f6561be..e143179d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/param/OrderPriceParam.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/param/OrderPriceParam.java @@ -3,7 +3,6 @@ package co.yixiang.modules.manage.param; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java index 87ec8a95..ac9ae8d4 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java @@ -10,18 +10,17 @@ package co.yixiang.modules.manage.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; - import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.interceptor.AuthCheck; +import co.yixiang.modules.manage.param.OrderPriceParam; import co.yixiang.modules.manage.param.ShoperQueryParam; import co.yixiang.modules.order.param.OrderDeliveryParam; -import co.yixiang.modules.manage.param.OrderPriceParam; import co.yixiang.modules.order.param.OrderRefundParam; import co.yixiang.modules.order.service.YxExpressService; import co.yixiang.modules.order.service.YxStoreOrderService; -import co.yixiang.modules.order.vo.ShoperOrderTimeDataVo; import co.yixiang.modules.order.vo.OrderDataVo; +import co.yixiang.modules.order.vo.ShoperOrderTimeDataVo; import co.yixiang.modules.order.vo.UserOrderCountVo; import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import io.swagger.annotations.Api; @@ -30,7 +29,12 @@ 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.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.LinkedHashMap; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/param/ComputeOrderParam.java b/yshop-app/src/main/java/co/yixiang/modules/order/param/ComputeOrderParam.java index 6218c53d..cc70bc36 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/param/ComputeOrderParam.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/param/ComputeOrderParam.java @@ -5,8 +5,6 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import javax.validation.constraints.NotBlank; - /** * @ClassName ComputeOrderParam * @Author hupeng <610796224@qq.com> diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 5d5b7e46..f024faf1 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -20,7 +20,17 @@ import co.yixiang.enums.OrderInfoEnum; import co.yixiang.enums.OrderLogEnum; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.dto.OrderExtendDto; -import co.yixiang.modules.order.param.*; +import co.yixiang.modules.order.param.ComputeOrderParam; +import co.yixiang.modules.order.param.ConfirmOrderParam; +import co.yixiang.modules.order.param.DoOrderParam; +import co.yixiang.modules.order.param.ExpressParam; +import co.yixiang.modules.order.param.HandleOrderParam; +import co.yixiang.modules.order.param.OrderParam; +import co.yixiang.modules.order.param.OrderVerifyParam; +import co.yixiang.modules.order.param.PayParam; +import co.yixiang.modules.order.param.ProductOrderParam; +import co.yixiang.modules.order.param.ProductReplyParam; +import co.yixiang.modules.order.param.RefundParam; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.vo.ComputeVo; import co.yixiang.modules.order.vo.ConfirmOrderVo; @@ -40,7 +50,12 @@ 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 javax.validation.Valid; import java.math.BigDecimal; diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index e93350fe..0a327355 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -45,9 +45,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-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java index 97824dca..55a690e5 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java @@ -12,12 +12,10 @@ import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; 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 cn.hutool.http.HttpUtil; import co.yixiang.api.YshopException; -import co.yixiang.common.bean.LocalUser; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.OrderInfoEnum; @@ -38,7 +36,6 @@ import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; -import com.google.common.collect.Maps; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; @@ -57,7 +54,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Map; import static co.yixiang.utils.FileUtil.transformStyle; diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java index 62732cc9..7f8ee270 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java @@ -12,7 +12,11 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; -import co.yixiang.enums.*; +import co.yixiang.enums.AppFromEnum; +import co.yixiang.enums.BillDetailEnum; +import co.yixiang.enums.OrderInfoEnum; +import co.yixiang.enums.OrderLogEnum; +import co.yixiang.enums.PayTypeEnum; import co.yixiang.modules.activity.domain.YxStoreBargainUser; import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -20,12 +24,12 @@ import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.domain.YxStoreOrderCartInfo; import co.yixiang.modules.order.dto.OrderExtendDto; -import co.yixiang.modules.order.service.dto.ProductAttrDto; -import co.yixiang.modules.order.vo.OrderCartInfoVo; -import co.yixiang.modules.order.service.dto.ProductDto; import co.yixiang.modules.order.param.ComputeOrderParam; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; +import co.yixiang.modules.order.service.dto.ProductAttrDto; +import co.yixiang.modules.order.service.dto.ProductDto; +import co.yixiang.modules.order.vo.OrderCartInfoVo; import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.mp.service.WeixinPayService; import com.alibaba.fastjson.JSONObject; diff --git a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java index 9aa44da4..587c2089 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.shop.rest; import co.yixiang.api.ApiResult; - import co.yixiang.modules.wechat.service.YxArticleService; import co.yixiang.modules.wechat.vo.YxArticleQueryVo; import io.swagger.annotations.Api; @@ -17,7 +16,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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java index 3447bb58..86775ea6 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java @@ -10,19 +10,15 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.io.file.FileReader; import cn.hutool.core.io.resource.ClassPathResource; - - import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; - import co.yixiang.enums.ProductEnum; import co.yixiang.modules.product.service.YxStoreProductService; import co.yixiang.modules.product.vo.YxSystemStoreQueryVo; import co.yixiang.modules.shop.param.YxSystemStoreQueryParam; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.YxSystemStoreService; - import co.yixiang.utils.FileUtil; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.ShopKeyUtils; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java index e436b31c..2fb2ba8a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java @@ -10,7 +10,6 @@ package co.yixiang.modules.user.rest; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; - import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; @@ -18,18 +17,12 @@ import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.common.util.CityTreeUtil; import co.yixiang.common.web.param.IdParam; import co.yixiang.constant.ShopConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.template.domain.YxSystemCity; import co.yixiang.modules.template.service.YxSystemCityService; -import co.yixiang.modules.user.domain.YxUserAddress; -import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.param.AddressParam; -import co.yixiang.modules.user.param.YxUserAddressQueryParam; +import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.vo.CityVo; import co.yixiang.modules.user.vo.YxUserAddressQueryVo; -import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.SecurityUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,7 +30,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; -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.util.LinkedHashMap; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index e5fc00b8..4b87b5ed 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -32,7 +32,12 @@ 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.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.ArrayList; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java index d96585ca..a4217c88 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java @@ -22,13 +22,11 @@ import co.yixiang.modules.product.vo.YxStoreProductRelationQueryVo; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.param.UserEditParam; -import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxUserSignService; import co.yixiang.modules.user.vo.SignVo; import co.yixiang.modules.user.vo.YxUserQueryVo; -import co.yixiang.utils.SecurityUtils; import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,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.List; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java index a043fb5c..6245ac6a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java @@ -15,11 +15,9 @@ import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; -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; -import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index 45876a2a..5accae7f 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.rest; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; @@ -17,7 +16,6 @@ import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.BillDetailEnum; -import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java index 8ec3556d..63d7b1ef 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java @@ -10,25 +10,21 @@ package co.yixiang.modules.wechat.rest.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import co.yixiang.annotation.AnonymousAccess; - import co.yixiang.api.ApiResult; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.BillDetailEnum; import co.yixiang.enums.OrderInfoEnum; - import co.yixiang.enums.PayMethodEnum; import co.yixiang.enums.PayTypeEnum; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; - import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; - import co.yixiang.modules.user.domain.YxUserRecharge; import co.yixiang.modules.user.service.YxUserRechargeService; -import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.config.WxPayConfiguration; +import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.BigNum; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; @@ -39,7 +35,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import me.chanjar.weixin.common.bean.WxJsapiSignature; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java index 37b98d5c..f415280a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java @@ -17,16 +17,11 @@ import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; -import co.yixiang.exception.BadRequestException; -import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; -import co.yixiang.modules.user.vo.YxUserQueryVo; import co.yixiang.modules.wechat.rest.param.BindPhoneParam; import co.yixiang.modules.wechat.rest.param.WxPhoneParam; -import co.yixiang.utils.RedisUtil; import co.yixiang.utils.RedisUtils; -import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.ShopKeyUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-common/src/main/java/co/yixiang/annotation/DataSource.java b/yshop-common/src/main/java/co/yixiang/annotation/DataSource.java index f9050ce4..65d96c2d 100644 --- a/yshop-common/src/main/java/co/yixiang/annotation/DataSource.java +++ b/yshop-common/src/main/java/co/yixiang/annotation/DataSource.java @@ -2,7 +2,11 @@ package co.yixiang.annotation; import co.yixiang.enums.DataSourceType; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/yshop-common/src/main/java/co/yixiang/annotation/Query.java b/yshop-common/src/main/java/co/yixiang/annotation/Query.java index 54d3b2c9..a3b7c068 100644 --- a/yshop-common/src/main/java/co/yixiang/annotation/Query.java +++ b/yshop-common/src/main/java/co/yixiang/annotation/Query.java @@ -6,11 +6,6 @@ */ package co.yixiang.annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - /** * @author Zheng Jie * @date 2019-6-4 13:52:30 diff --git a/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java b/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java index 13e8fa50..1c9b7efc 100644 --- a/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java +++ b/yshop-common/src/main/java/co/yixiang/domain/BaseDomain.java @@ -1,6 +1,8 @@ package co.yixiang.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/yshop-common/src/main/java/co/yixiang/enums/PinkEnum.java b/yshop-common/src/main/java/co/yixiang/enums/PinkEnum.java index e687ad35..6831ee1e 100644 --- a/yshop-common/src/main/java/co/yixiang/enums/PinkEnum.java +++ b/yshop-common/src/main/java/co/yixiang/enums/PinkEnum.java @@ -8,8 +8,6 @@ package co.yixiang.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.stream.Stream; - /** * @author hupeng * 拼团相关枚举 diff --git a/yshop-common/src/main/java/co/yixiang/event/TemplateBean.java b/yshop-common/src/main/java/co/yixiang/event/TemplateBean.java index 163c1a4d..7a81f591 100644 --- a/yshop-common/src/main/java/co/yixiang/event/TemplateBean.java +++ b/yshop-common/src/main/java/co/yixiang/event/TemplateBean.java @@ -1,6 +1,10 @@ package co.yixiang.event; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * @ClassName TemplateBean 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 205d55db..d2a80668 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java +++ b/yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java @@ -18,7 +18,12 @@ 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/html/HTMLFilter.java b/yshop-common/src/main/java/co/yixiang/utils/html/HTMLFilter.java index 667a902d..1f3be192 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/html/HTMLFilter.java +++ b/yshop-common/src/main/java/co/yixiang/utils/html/HTMLFilter.java @@ -1,6 +1,10 @@ package co.yixiang.utils.html; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; @@ -563,4 +567,4 @@ public final class HTMLFilter { return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); } -} \ No newline at end of file +} diff --git a/yshop-common/src/main/java/co/yixiang/xss/XssFilter.java b/yshop-common/src/main/java/co/yixiang/xss/XssFilter.java index 699c58e3..cd9aa482 100644 --- a/yshop-common/src/main/java/co/yixiang/xss/XssFilter.java +++ b/yshop-common/src/main/java/co/yixiang/xss/XssFilter.java @@ -2,8 +2,12 @@ package co.yixiang.xss; import cn.hutool.core.util.StrUtil; - -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -14,7 +18,7 @@ import java.util.regex.Pattern; /** * 防止XSS攻击的过滤器 - * + * * @author ruoyi */ public class XssFilter implements Filter @@ -91,4 +95,4 @@ public class XssFilter implements Filter { } -} \ No newline at end of file +} 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 908ccc5d..6572da09 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 @@ -6,7 +6,6 @@ package co.yixiang.logging.domain; import co.yixiang.domain.BaseDomain; -import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -14,9 +13,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.sql.Timestamp; - /** * @author hupeng * @date 2018-11-24 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java index c569635a..2addfbaf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java @@ -13,7 +13,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; +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.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index fe3274ad..882c4415 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -16,7 +16,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; +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.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java index 0f80f75d..39822f77 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java @@ -10,7 +10,11 @@ import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index cc208b0e..2f16f4af 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -10,7 +10,11 @@ import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index 3673e77a..1d72e525 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -13,7 +13,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; +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.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java index ac6b75d6..a5b9bc50 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainService.java @@ -10,7 +10,8 @@ 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.*; +import co.yixiang.modules.activity.service.dto.YxStoreBargainDto; +import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; import co.yixiang.modules.activity.vo.BargainCountVo; import co.yixiang.modules.activity.vo.BargainVo; import co.yixiang.modules.activity.vo.TopCountVo; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java index dcc68d33..96ff1606 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java @@ -10,9 +10,9 @@ package co.yixiang.modules.activity.service; import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreCombination; -import co.yixiang.modules.activity.vo.StoreCombinationVo; import co.yixiang.modules.activity.service.dto.YxStoreCombinationDto; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; +import co.yixiang.modules.activity.vo.StoreCombinationVo; import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java index f55e4bce..16e8b3f4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java @@ -10,7 +10,9 @@ 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.*; +import co.yixiang.modules.activity.service.dto.PinkAllDto; +import co.yixiang.modules.activity.service.dto.YxStorePinkDto; +import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import co.yixiang.modules.activity.vo.PinkInfoVo; import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java index 6ae3354b..f87e9845 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreSeckillService.java @@ -10,9 +10,9 @@ package co.yixiang.modules.activity.service; import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStoreSeckill; -import co.yixiang.modules.activity.vo.StoreSeckillVo; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; +import co.yixiang.modules.activity.vo.StoreSeckillVo; import co.yixiang.modules.activity.vo.YxStoreSeckillQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkUserDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkUserDto.java index 20298f4c..e8974ae5 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkUserDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkUserDto.java @@ -1,7 +1,11 @@ package co.yixiang.modules.activity.service.dto; import co.yixiang.modules.activity.domain.YxStorePink; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.List; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index 3cfc3232..fbe5b12d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -13,7 +13,6 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java index b086153a..0f6e1504 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 108a1f43..8837e87a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -46,7 +46,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; 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; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 5473d7bd..485a769c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -30,7 +30,6 @@ import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; import co.yixiang.modules.activity.vo.StoreCombinationVo; import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; -import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.service.YxStoreProductAttrService; import co.yixiang.modules.product.service.YxStoreProductAttrValueService; import co.yixiang.modules.product.service.YxStoreProductReplyService; @@ -50,7 +49,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java index a5a967cf..0c365a55 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java @@ -29,7 +29,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -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-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index 22497899..f37f3c3f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -43,7 +43,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index d26eb3de..658652c0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -22,7 +22,11 @@ import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.activity.service.dto.*; +import co.yixiang.modules.activity.service.dto.PinkAllDto; +import co.yixiang.modules.activity.service.dto.PinkDto; +import co.yixiang.modules.activity.service.dto.PinkUserDto; +import co.yixiang.modules.activity.service.dto.YxStorePinkDto; +import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCombinationMapper; import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; import co.yixiang.modules.activity.vo.PinkInfoVo; @@ -49,7 +53,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -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; import java.util.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index 7d6d3a58..6cf5a6f6 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -16,10 +16,10 @@ import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; -import co.yixiang.modules.activity.vo.StoreSeckillVo; 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.modules.activity.vo.StoreSeckillVo; import co.yixiang.modules.activity.vo.YxStoreSeckillQueryVo; import co.yixiang.modules.product.service.YxStoreProductReplyService; import co.yixiang.utils.FileUtil; @@ -27,7 +27,6 @@ import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; -import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -36,7 +35,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java index f947ee4d..af52599a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java @@ -38,7 +38,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; 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; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java index a66b7930..dc5b2f64 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java @@ -1,7 +1,6 @@ package co.yixiang.modules.activity.vo; -import co.yixiang.modules.activity.vo.YxStoreBargainQueryVo; import co.yixiang.modules.user.vo.YxUserQueryVo; import lombok.Builder; import lombok.Data; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java index a1fa2aa6..e762fb10 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java @@ -1,8 +1,6 @@ package co.yixiang.modules.activity.vo; -import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; -import co.yixiang.modules.activity.vo.YxStorePinkQueryVo; import co.yixiang.modules.user.vo.YxUserQueryVo; import lombok.Builder; import lombok.Data; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java index c51415e8..f325399b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java @@ -1,7 +1,6 @@ package co.yixiang.modules.activity.vo; import co.yixiang.modules.activity.service.dto.PinkDto; - import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; import lombok.Data; @@ -39,4 +38,4 @@ public class StoreCombinationVo implements Serializable { -} \ No newline at end of file +} diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java index 72d14a74..8d0afc57 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java @@ -1,7 +1,6 @@ package co.yixiang.modules.activity.vo; -import co.yixiang.modules.activity.vo.YxStoreSeckillQueryVo; import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; import lombok.Builder; import lombok.Data; @@ -32,4 +31,4 @@ public class StoreSeckillVo implements Serializable { -} \ No newline at end of file +} diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainUserQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainUserQueryVo.java index a0bae65d..16a49c7c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainUserQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainUserQueryVo.java @@ -1,6 +1,5 @@ package co.yixiang.modules.activity.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,4 +51,4 @@ public class YxStoreBargainUserQueryVo implements Serializable { private Date datatime; -} \ No newline at end of file +} diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCombinationQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCombinationQueryVo.java index a338a32b..643ddd2e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCombinationQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCombinationQueryVo.java @@ -9,7 +9,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java index 06989926..66fcd793 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java @@ -10,7 +10,11 @@ import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java index ea0e2fb6..eaa7389c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java @@ -53,7 +53,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -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.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/category/service/YxStoreCategoryService.java b/yshop-mall/src/main/java/co/yixiang/modules/category/service/YxStoreCategoryService.java index 10059dd0..f072ac54 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/category/service/YxStoreCategoryService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/category/service/YxStoreCategoryService.java @@ -9,7 +9,6 @@ package co.yixiang.modules.category.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.category.domain.YxStoreCategory; import co.yixiang.modules.category.service.dto.YxStoreCategoryDto; import co.yixiang.modules.category.service.dto.YxStoreCategoryQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java index e08ddb77..1f3562a7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java @@ -33,7 +33,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +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; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java index 600c2444..4477eb16 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java @@ -11,7 +11,11 @@ import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxExpressService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxExpressService.java index 063eba4e..acb5fe8c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxExpressService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxExpressService.java @@ -6,7 +6,6 @@ package co.yixiang.modules.order.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.dto.YxExpressDto; import co.yixiang.modules.order.service.dto.YxExpressQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java index 7364cf9b..c6c34e9a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java @@ -6,7 +6,6 @@ package co.yixiang.modules.order.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.order.domain.YxStoreOrderCartInfo; import co.yixiang.modules.order.service.dto.YxStoreOrderCartInfoDto; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java index dcd0fff3..4fdcf5c1 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java @@ -15,7 +15,12 @@ import co.yixiang.modules.order.service.dto.OrderCountDto; import co.yixiang.modules.order.service.dto.OrderTimeDataDto; import co.yixiang.modules.order.service.dto.YxStoreOrderDto; import co.yixiang.modules.order.service.dto.YxStoreOrderQueryCriteria; -import co.yixiang.modules.order.vo.*; +import co.yixiang.modules.order.vo.ComputeVo; +import co.yixiang.modules.order.vo.ConfirmOrderVo; +import co.yixiang.modules.order.vo.OrderDataVo; +import co.yixiang.modules.order.vo.ShoperOrderTimeDataVo; +import co.yixiang.modules.order.vo.UserOrderCountVo; +import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.user.domain.YxUser; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java index c2ad034a..7ace82ae 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java @@ -9,7 +9,6 @@ package co.yixiang.modules.order.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.order.domain.YxStoreOrderStatus; import co.yixiang.modules.order.service.dto.YxStoreOrderStatusDto; import co.yixiang.modules.order.service.dto.YxStoreOrderStatusQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/CacheDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/CacheDto.java index f0d4ae11..fa65bc04 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/CacheDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/CacheDto.java @@ -1,7 +1,6 @@ package co.yixiang.modules.order.service.dto; import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; - import lombok.Data; import java.io.Serializable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/TemplateDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/TemplateDto.java index 8434684f..0e818fcc 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/TemplateDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/TemplateDto.java @@ -1,6 +1,10 @@ package co.yixiang.modules.order.service.dto; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.math.BigDecimal; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxExpressServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxExpressServiceImpl.java index db276cce..0e0d3204 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxExpressServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxExpressServiceImpl.java @@ -8,7 +8,6 @@ package co.yixiang.modules.order.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.YxExpressService; import co.yixiang.modules.order.service.dto.YxExpressDto; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java index b2bc9e5b..fb0c07ee 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -9,7 +9,6 @@ import cn.hutool.core.util.IdUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.order.domain.YxStoreOrderCartInfo; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 4205491a..c80cfecb 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -21,7 +21,15 @@ import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.enums.*; +import co.yixiang.enums.AppFromEnum; +import co.yixiang.enums.BillDetailEnum; +import co.yixiang.enums.CouponEnum; +import co.yixiang.enums.OrderInfoEnum; +import co.yixiang.enums.OrderLogEnum; +import co.yixiang.enums.OrderStatusEnum; +import co.yixiang.enums.PayTypeEnum; +import co.yixiang.enums.ShippingTempEnum; +import co.yixiang.enums.ShopCommonEnum; import co.yixiang.event.TemplateBean; import co.yixiang.event.TemplateEvent; import co.yixiang.event.TemplateListenEnum; @@ -29,7 +37,12 @@ import co.yixiang.exception.EntityExistException; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.modules.activity.domain.YxStorePink; -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.YxStoreCouponUserService; +import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.vo.StoreCouponUserVo; import co.yixiang.modules.cart.domain.YxStoreCart; import co.yixiang.modules.cart.service.YxStoreCartService; @@ -43,9 +56,24 @@ import co.yixiang.modules.order.service.YxExpressService; 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.service.dto.*; +import co.yixiang.modules.order.service.dto.CacheDto; +import co.yixiang.modules.order.service.dto.CountDto; +import co.yixiang.modules.order.service.dto.OrderCountDto; +import co.yixiang.modules.order.service.dto.OrderTimeDataDto; +import co.yixiang.modules.order.service.dto.OtherDto; +import co.yixiang.modules.order.service.dto.PriceGroupDto; +import co.yixiang.modules.order.service.dto.StatusDto; +import co.yixiang.modules.order.service.dto.StoreOrderCartInfoDto; +import co.yixiang.modules.order.service.dto.TemplateDto; +import co.yixiang.modules.order.service.dto.YxStoreOrderDto; +import co.yixiang.modules.order.service.dto.YxStoreOrderQueryCriteria; import co.yixiang.modules.order.service.mapper.StoreOrderMapper; -import co.yixiang.modules.order.vo.*; +import co.yixiang.modules.order.vo.ComputeVo; +import co.yixiang.modules.order.vo.ConfirmOrderVo; +import co.yixiang.modules.order.vo.OrderDataVo; +import co.yixiang.modules.order.vo.ShoperOrderTimeDataVo; +import co.yixiang.modules.order.vo.UserOrderCountVo; +import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.product.domain.YxStoreProductReply; import co.yixiang.modules.product.service.YxStoreProductReplyService; import co.yixiang.modules.product.service.YxStoreProductService; @@ -94,7 +122,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java index 3e8b9797..de410ae9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java @@ -9,7 +9,6 @@ package co.yixiang.modules.order.service.mapper; import co.yixiang.common.mapper.CoreMapper; - import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.service.dto.ChartDataDto; import co.yixiang.modules.order.vo.OrderDataVo; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ConfirmOrderVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ConfirmOrderVo.java index 29d018e6..30eaa498 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ConfirmOrderVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ConfirmOrderVo.java @@ -1,10 +1,8 @@ package co.yixiang.modules.order.vo; -import co.yixiang.modules.activity.domain.YxStoreCouponUser; import co.yixiang.modules.activity.vo.StoreCouponUserVo; import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.order.service.dto.PriceGroupDto; - import co.yixiang.modules.product.vo.YxSystemStoreQueryVo; import co.yixiang.modules.user.domain.YxUserAddress; import co.yixiang.modules.user.vo.YxUserQueryVo; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java index 23c7fa93..315a236e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java @@ -1,6 +1,10 @@ package co.yixiang.modules.order.vo; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.io.Serializable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java index de86c292..31045acf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java @@ -12,9 +12,17 @@ import co.yixiang.modules.category.domain.YxStoreCategory; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; -import javax.validation.constraints.*; +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.math.BigDecimal; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java index 6ca136fc..86c8061e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java @@ -10,7 +10,11 @@ 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.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.io.Serializable; import java.math.BigDecimal; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java index f27133c2..6bb4f82b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java @@ -5,7 +5,11 @@ import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** *

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java index 7ece6a6d..3209f019 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java @@ -12,7 +12,11 @@ import co.yixiang.modules.user.domain.YxUser; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java index f4545311..77256302 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java @@ -9,11 +9,10 @@ package co.yixiang.modules.product.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.product.domain.YxStoreProductReply; -import co.yixiang.modules.product.vo.ReplyCountVo; import co.yixiang.modules.product.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.product.service.dto.YxStoreProductReplyQueryCriteria; +import co.yixiang.modules.product.vo.ReplyCountVo; import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRuleService.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRuleService.java index 417d92ba..4ee0ce0b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRuleService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRuleService.java @@ -13,10 +13,11 @@ import co.yixiang.modules.product.domain.YxStoreProductRule; import co.yixiang.modules.product.service.dto.YxStoreProductRuleDto; import co.yixiang.modules.product.service.dto.YxStoreProductRuleQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/product/service/dto/FromatDetailDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/FromatDetailDto.java index 1e9bf4be..4e108e0e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/FromatDetailDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/FromatDetailDto.java @@ -5,7 +5,11 @@ */ package co.yixiang.modules.product.service.dto; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.List; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java index c8acd385..614230b9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java @@ -6,7 +6,11 @@ package co.yixiang.modules.product.service.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Map; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleDto.java index ab091448..a7e89854 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleDto.java @@ -10,8 +10,9 @@ package co.yixiang.modules.product.service.dto; import com.alibaba.fastjson.JSONArray; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleQueryCriteria.java index b958ede2..599285ce 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductRuleQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.product.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java index 7dd3f40e..114aa6dd 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java @@ -34,7 +34,12 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java index d52672f2..9e8d42e9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java @@ -14,16 +14,15 @@ 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.enums.ShopCommonEnum; import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.product.domain.YxStoreProductReply; import co.yixiang.modules.product.service.YxStoreProductReplyService; import co.yixiang.modules.product.service.YxStoreProductService; -import co.yixiang.modules.product.vo.ReplyCountVo; import co.yixiang.modules.product.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.product.service.dto.YxStoreProductReplyQueryCriteria; import co.yixiang.modules.product.service.mapper.StoreProductReplyMapper; +import co.yixiang.modules.product.vo.ReplyCountVo; import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.FileUtil; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index 8cf1b941..ddc16da3 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -20,15 +20,29 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.enums.*; +import co.yixiang.enums.CommonEnum; +import co.yixiang.enums.ProductEnum; +import co.yixiang.enums.ShopCommonEnum; +import co.yixiang.enums.SortEnum; +import co.yixiang.enums.SpecTypeEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.category.service.YxStoreCategoryService; import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; import co.yixiang.modules.product.param.YxStoreProductQueryParam; -import co.yixiang.modules.product.service.*; -import co.yixiang.modules.product.service.dto.*; +import co.yixiang.modules.product.service.YxStoreProductAttrService; +import co.yixiang.modules.product.service.YxStoreProductAttrValueService; +import co.yixiang.modules.product.service.YxStoreProductRelationService; +import co.yixiang.modules.product.service.YxStoreProductReplyService; +import co.yixiang.modules.product.service.YxStoreProductService; +import co.yixiang.modules.product.service.dto.DetailDto; +import co.yixiang.modules.product.service.dto.FromatDetailDto; +import co.yixiang.modules.product.service.dto.ProductFormatDto; +import co.yixiang.modules.product.service.dto.ProductResultDto; +import co.yixiang.modules.product.service.dto.StoreProductDto; +import co.yixiang.modules.product.service.dto.YxStoreProductDto; +import co.yixiang.modules.product.service.dto.YxStoreProductQueryCriteria; import co.yixiang.modules.product.service.mapper.StoreProductMapper; import co.yixiang.modules.product.vo.ProductVo; import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo; @@ -57,7 +71,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductAttrValueMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductAttrValueMapper.java index 35288ecf..fb350aa9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductAttrValueMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/StoreProductAttrValueMapper.java @@ -9,7 +9,6 @@ package co.yixiang.modules.product.service.mapper; import co.yixiang.common.mapper.CoreMapper; - import co.yixiang.modules.product.domain.YxStoreProductAttrValue; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ProductVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ProductVo.java index c9846583..342faf30 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ProductVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ProductVo.java @@ -1,13 +1,7 @@ package co.yixiang.modules.product.vo; -import co.yixiang.common.web.param.QueryParam; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; -import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo; -import co.yixiang.modules.product.vo.YxStoreProductQueryVo; -import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; -import co.yixiang.modules.product.vo.YxSystemStoreQueryVo; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ReplyCountVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ReplyCountVo.java index 859cbe45..92abc3b5 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ReplyCountVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/ReplyCountVo.java @@ -1,6 +1,10 @@ package co.yixiang.modules.product.vo; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.io.Serializable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxSystemStoreQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxSystemStoreQueryVo.java index d05aea28..23a578cf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxSystemStoreQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxSystemStoreQueryVo.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** *

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java index a554b87d..d3b58931 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java @@ -6,7 +6,11 @@ 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.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** *

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java index 48838660..5b70d925 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java @@ -10,7 +10,11 @@ import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java index 038d23d0..a9058025 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java @@ -8,7 +8,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java index d5b1a226..bcde5b84 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java @@ -8,7 +8,6 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 3122ba61..079253ad 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -13,7 +13,6 @@ 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.enums.CommonEnum; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.product.vo.YxSystemStoreQueryVo; import co.yixiang.modules.shop.domain.YxSystemStore; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/vo/YxSystemGroupDataVo.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/vo/YxSystemGroupDataVo.java index 648aa240..040d9f7b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/vo/YxSystemGroupDataVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/vo/YxSystemGroupDataVo.java @@ -5,13 +5,9 @@ */ package co.yixiang.modules.shop.vo; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.Getter; +import lombok.Setter; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesFree.java b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesFree.java index 3e3c05b9..b3e4b9fa 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesFree.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesFree.java @@ -7,18 +7,20 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.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.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; -import java.math.BigDecimal; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesRegion.java b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesRegion.java index c2faee13..6f7cf5f9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesRegion.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplatesRegion.java @@ -7,18 +7,20 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.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.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; -import java.math.BigDecimal; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxSystemCity.java b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxSystemCity.java index 90e0dcf5..aaa9203d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxSystemCity.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/domain/YxSystemCity.java @@ -7,14 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.domain; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; + import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesFreeService.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesFreeService.java index d08788c7..a4a4596d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesFreeService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesFreeService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.template.domain.YxShippingTemplatesFree; import co.yixiang.modules.template.service.dto.YxShippingTemplatesFreeDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesFreeQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesRegionService.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesRegionService.java index 37cc2e52..ee9d0573 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesRegionService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesRegionService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.template.domain.YxShippingTemplatesRegion; import co.yixiang.modules.template.service.dto.YxShippingTemplatesRegionDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesRegionQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesService.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesService.java index 3434df2e..baffac7f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxShippingTemplatesService.java @@ -7,16 +7,18 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.template.domain.YxShippingTemplates; import co.yixiang.modules.template.service.dto.ShippingTemplatesDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/template/service/YxSystemCityService.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxSystemCityService.java index 591c8220..df2570e1 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxSystemCityService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/YxSystemCityService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.template.domain.YxSystemCity; import co.yixiang.modules.template.service.dto.YxSystemCityDto; import co.yixiang.modules.template.service.dto.YxSystemCityQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesDto.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesDto.java index 696bb167..0860985e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.sql.Timestamp; + import java.io.Serializable; +import java.sql.Timestamp; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeDto.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeDto.java index 03a5b53f..63b89732 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeQueryCriteria.java index 2f4584e8..c3a0da92 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesFreeQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesQueryCriteria.java index 7d88af85..2d329314 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionDto.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionDto.java index 14a94648..f9ae21a9 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionDto.java @@ -9,8 +9,9 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.math.BigDecimal; + import java.io.Serializable; +import java.math.BigDecimal; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionQueryCriteria.java index 9805a9f1..fc5a5f85 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxShippingTemplatesRegionQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityDto.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityDto.java index 1e92d225..234edec6 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityDto.java @@ -9,6 +9,7 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; + import java.io.Serializable; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityQueryCriteria.java index 3c263044..5f47621a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/YxSystemCityQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.template.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java index cfd31ac1..3c9e9527 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java @@ -22,7 +22,13 @@ import co.yixiang.modules.template.domain.YxShippingTemplatesRegion; import co.yixiang.modules.template.service.YxShippingTemplatesFreeService; import co.yixiang.modules.template.service.YxShippingTemplatesRegionService; import co.yixiang.modules.template.service.YxShippingTemplatesService; -import co.yixiang.modules.template.service.dto.*; +import co.yixiang.modules.template.service.dto.AppointInfoDto; +import co.yixiang.modules.template.service.dto.RegionChildrenDto; +import co.yixiang.modules.template.service.dto.RegionDto; +import co.yixiang.modules.template.service.dto.RegionInfoDto; +import co.yixiang.modules.template.service.dto.ShippingTemplatesDto; +import co.yixiang.modules.template.service.dto.YxShippingTemplatesDto; +import co.yixiang.modules.template.service.dto.YxShippingTemplatesQueryCriteria; import co.yixiang.modules.template.service.mapper.YxShippingTemplatesMapper; import co.yixiang.utils.FileUtil; import com.alibaba.fastjson.JSON; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java index 00eefef0..13af58d8 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java @@ -9,12 +9,19 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import co.yixiang.modules.user.service.dto.WechatUserDto; -import com.baomidou.mybatisplus.annotation.*; +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 com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; import lombok.experimental.Accessors; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java index 34c87c76..fc8a2d38 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java @@ -6,7 +6,11 @@ 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.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** *

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java index f655e091..4432258e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java @@ -10,7 +10,11 @@ import cn.hutool.core.bean.copier.CopyOptions; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java index 8349b1c7..13219869 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java @@ -6,7 +6,11 @@ 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; /** *

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java index 4a638302..d37b9506 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserLevelService.java @@ -10,7 +10,6 @@ package co.yixiang.modules.user.service; import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemUserLevel; - import co.yixiang.modules.user.service.dto.UserLevelDto; import co.yixiang.modules.user.service.dto.YxSystemUserLevelDto; import co.yixiang.modules.user.service.dto.YxSystemUserLevelQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java index 6e120bc9..c21a8df0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.user.domain.YxSystemUserTask; import co.yixiang.modules.user.service.dto.TaskDto; import co.yixiang.modules.user.service.dto.YxSystemUserTaskDto; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java index 35b8d362..1554ad82 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java @@ -9,11 +9,10 @@ package co.yixiang.modules.user.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.user.domain.YxUserBill; -import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.service.dto.YxUserBillDto; import co.yixiang.modules.user.service.dto.YxUserBillQueryCriteria; +import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.vo.YxUserBillQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java index 6a418874..0d98d12f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.dto.PromUserDto; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/WechatUserDto.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/WechatUserDto.java index 1f30e332..74ddbc09 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/WechatUserDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/WechatUserDto.java @@ -1,6 +1,10 @@ package co.yixiang.modules.user.service.dto; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * @ClassName WechatUserDTO diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java index d683b733..5560b2bb 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java @@ -15,12 +15,14 @@ import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.shop.domain.YxSystemUserLevel; - import co.yixiang.modules.user.domain.YxUserLevel; import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxSystemUserTaskService; import co.yixiang.modules.user.service.YxUserLevelService; -import co.yixiang.modules.user.service.dto.*; +import co.yixiang.modules.user.service.dto.TaskDto; +import co.yixiang.modules.user.service.dto.UserLevelDto; +import co.yixiang.modules.user.service.dto.YxSystemUserLevelDto; +import co.yixiang.modules.user.service.dto.YxSystemUserLevelQueryCriteria; import co.yixiang.modules.user.service.mapper.SystemUserLevelMapper; import co.yixiang.modules.user.vo.YxSystemUserLevelQueryVo; import co.yixiang.utils.FileUtil; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java index 6cb4619f..5db92804 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java @@ -15,7 +15,6 @@ import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.order.service.mapper.StoreOrderMapper; import co.yixiang.modules.shop.domain.YxSystemUserLevel; - import co.yixiang.modules.user.domain.YxSystemUserTask; import co.yixiang.modules.user.domain.YxUserTaskFinish; import co.yixiang.modules.user.service.YxSystemUserLevelService; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index e9a2b239..430f388e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.service.impl; -import cn.hutool.Hutool; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.common.service.impl.BaseServiceImpl; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java index 7d01826e..c96663fb 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java @@ -10,14 +10,16 @@ package co.yixiang.modules.user.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.enums.BillDetailEnum; import co.yixiang.enums.BillEnum; import co.yixiang.enums.BillInfoEnum; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.user.domain.YxUserBill; import co.yixiang.modules.user.service.YxUserBillService; -import co.yixiang.modules.user.service.dto.*; +import co.yixiang.modules.user.service.dto.BillOrderDto; +import co.yixiang.modules.user.service.dto.BillOrderRecordDto; +import co.yixiang.modules.user.service.dto.YxUserBillDto; +import co.yixiang.modules.user.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.user.service.mapper.UserBillMapper; import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.vo.YxUserBillQueryVo; @@ -36,7 +38,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -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-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java index 8833caa7..cae19365 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java @@ -10,7 +10,6 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.ObjectUtil; import co.yixiang.common.service.impl.BaseServiceImpl; - import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.shop.domain.YxSystemUserLevel; @@ -20,7 +19,6 @@ import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxSystemUserTaskService; import co.yixiang.modules.user.service.YxUserLevelService; import co.yixiang.modules.user.service.YxUserService; - import co.yixiang.modules.user.service.mapper.SystemUserTaskMapper; import co.yixiang.modules.user.service.mapper.YxUserLevelMapper; import co.yixiang.utils.OrderUtil; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java index e165feb2..f2a8a445 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java @@ -43,7 +43,11 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; 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; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index 0d7de888..ebeb5696 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -17,7 +17,6 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.enums.BillDetailEnum; import co.yixiang.enums.Brokerage; import co.yixiang.enums.ShopCommonEnum; @@ -60,7 +59,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; 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.stream.Collectors; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java index 0d53a444..a16c016a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java @@ -9,9 +9,10 @@ package co.yixiang.modules.user.service.mapper; import co.yixiang.common.mapper.CoreMapper; - import co.yixiang.modules.user.domain.YxUserBill; -import co.yixiang.modules.user.service.dto.*; +import co.yixiang.modules.user.service.dto.BillOrderRecordDto; +import co.yixiang.modules.user.service.dto.MUserBillDto; +import co.yixiang.modules.user.service.dto.YxUserBillDto; import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.vo.SignVo; import com.baomidou.mybatisplus.core.conditions.Wrapper; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserMapper.java index 3ef5a9e5..7794d0e7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserMapper.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.service.mapper; import co.yixiang.common.mapper.CoreMapper; - import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.dto.PromUserDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/YxUserLevelMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/YxUserLevelMapper.java index 74f6edfa..a724a602 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/YxUserLevelMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/YxUserLevelMapper.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.service.mapper; import co.yixiang.common.mapper.CoreMapper; - import co.yixiang.modules.user.domain.YxUserLevel; import co.yixiang.modules.user.service.dto.UserLevelInfoDto; import org.apache.ibatis.annotations.Select; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java index 2bc131d2..429f1e3a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java @@ -7,14 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLiveGoods.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLiveGoods.java index 79a12275..00d80ba4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLiveGoods.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLiveGoods.java @@ -7,14 +7,16 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.domain; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxArticleService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxArticleService.java index bb3f8d45..9a14f2f0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxArticleService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxArticleService.java @@ -9,11 +9,9 @@ package co.yixiang.modules.wechat.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.wechat.domain.YxArticle; import co.yixiang.modules.wechat.service.dto.YxArticleDto; import co.yixiang.modules.wechat.service.dto.YxArticleQueryCriteria; - import co.yixiang.modules.wechat.vo.YxArticleQueryVo; import org.springframework.data.domain.Pageable; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java index 7290ff1f..d45943db 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java index 36ede6fe..c3c74688 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java @@ -7,15 +7,17 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.service; + import co.yixiang.common.service.BaseService; import co.yixiang.modules.wechat.domain.YxWechatLive; import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; 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-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatMenuService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatMenuService.java index 8f14e146..076491bd 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatMenuService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatMenuService.java @@ -6,7 +6,6 @@ package co.yixiang.modules.wechat.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.wechat.domain.YxWechatMenu; import co.yixiang.modules.wechat.service.dto.YxWechatMenuDto; import co.yixiang.modules.wechat.service.dto.YxWechatMenuQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatReplyService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatReplyService.java index d7122776..5ade064a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatReplyService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatReplyService.java @@ -6,7 +6,6 @@ package co.yixiang.modules.wechat.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.wechat.domain.YxWechatReply; import co.yixiang.modules.wechat.service.dto.YxWechatReplyDto; import co.yixiang.modules.wechat.service.dto.YxWechatReplyQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.java index 035d3791..abae632f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.java @@ -6,7 +6,6 @@ package co.yixiang.modules.wechat.service; import co.yixiang.common.service.BaseService; - import co.yixiang.modules.wechat.domain.YxWechatTemplate; import co.yixiang.modules.wechat.service.dto.YxWechatTemplateDto; import co.yixiang.modules.wechat.service.dto.YxWechatTemplateQueryCriteria; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java index 6444312e..902b7b18 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java @@ -8,12 +8,12 @@ */ package co.yixiang.modules.wechat.service.dto; -import lombok.Data; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java index de393233..cfdfc591 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java @@ -8,10 +8,11 @@ */ package co.yixiang.modules.wechat.service.dto; -import lombok.Data; -import java.io.Serializable; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsQueryCriteria.java index 415d1b49..15c1b33e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsQueryCriteria.java @@ -8,9 +8,8 @@ */ package co.yixiang.modules.wechat.service.dto; -import lombok.Data; -import java.util.List; import co.yixiang.annotation.Query; +import lombok.Data; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveQueryCriteria.java index ad3089e7..19b0d982 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveQueryCriteria.java @@ -9,8 +9,6 @@ package co.yixiang.modules.wechat.service.dto; import lombok.Data; -import java.util.List; -import co.yixiang.annotation.Query; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveServiceImpl.java index 88635683..ca40dd8e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveServiceImpl.java @@ -2,25 +2,19 @@ package co.yixiang.modules.wechat.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; import co.yixiang.modules.wechat.service.WxMaLiveService; import co.yixiang.modules.wechat.service.dto.WxMaLiveInfo; import co.yixiang.modules.wechat.service.dto.WxMaLiveResult; import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.GsonParser; import com.google.gson.JsonObject; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.WxType; -import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java index ca56052b..f19dbb90 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java @@ -12,43 +12,39 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.hutool.core.util.ObjectUtil; 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.enums.LiveGoodsEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.wechat.service.WxMaLiveGoodsService; +import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService; import co.yixiang.modules.wechat.service.dto.WxMaLiveInfo; import co.yixiang.modules.wechat.service.dto.WxMaLiveResult; -import co.yixiang.tools.config.WxMaConfiguration; -import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; -import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria; import co.yixiang.modules.wechat.service.mapper.YxWechatLiveGoodsMapper; +import co.yixiang.tools.config.WxMaConfiguration; +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.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.error.WxErrorException; 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.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.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java index afa65669..33977c0e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java @@ -11,41 +11,44 @@ package co.yixiang.modules.wechat.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; 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.BadRequestException; import co.yixiang.modules.wechat.domain.YxWechatLive; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; import co.yixiang.modules.wechat.service.WxMaLiveService; import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService; -import co.yixiang.modules.wechat.service.dto.*; +import co.yixiang.modules.wechat.service.YxWechatLiveService; +import co.yixiang.modules.wechat.service.dto.WxMaLiveInfo; +import co.yixiang.modules.wechat.service.dto.WxMaLiveResult; +import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; +import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; +import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; +import co.yixiang.modules.wechat.service.mapper.YxWechatLiveMapper; import co.yixiang.tools.config.WxMaConfiguration; +import co.yixiang.utils.FileUtil; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; -import co.yixiang.common.utils.QueryHelpPlus; -import co.yixiang.utils.FileUtil; -import co.yixiang.modules.wechat.service.YxWechatLiveService; -import co.yixiang.modules.wechat.service.mapper.YxWechatLiveMapper; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.error.WxErrorException; 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.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.*; -import java.io.IOException; 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; /** * @author hupeng diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatMenuServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatMenuServiceImpl.java index f3afa47b..ae11aa74 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatMenuServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatMenuServiceImpl.java @@ -8,12 +8,10 @@ package co.yixiang.modules.wechat.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.modules.wechat.domain.YxWechatMenu; import co.yixiang.modules.wechat.service.YxWechatMenuService; import co.yixiang.modules.wechat.service.dto.YxWechatMenuDto; import co.yixiang.modules.wechat.service.dto.YxWechatMenuQueryCriteria; - import co.yixiang.modules.wechat.service.mapper.WechatMenuMapper; import co.yixiang.utils.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatReplyServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatReplyServiceImpl.java index 5f203a9f..9504941b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatReplyServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatReplyServiceImpl.java @@ -9,12 +9,10 @@ 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.wechat.domain.YxWechatReply; import co.yixiang.modules.wechat.service.YxWechatReplyService; import co.yixiang.modules.wechat.service.dto.YxWechatReplyDto; import co.yixiang.modules.wechat.service.dto.YxWechatReplyQueryCriteria; - import co.yixiang.modules.wechat.service.mapper.WechatReplyMapper; import co.yixiang.utils.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatTemplateServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatTemplateServiceImpl.java index 4fa54a76..31b300f6 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatTemplateServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatTemplateServiceImpl.java @@ -8,12 +8,10 @@ package co.yixiang.modules.wechat.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.modules.wechat.domain.YxWechatTemplate; import co.yixiang.modules.wechat.service.YxWechatTemplateService; import co.yixiang.modules.wechat.service.dto.YxWechatTemplateDto; import co.yixiang.modules.wechat.service.dto.YxWechatTemplateQueryCriteria; - import co.yixiang.modules.wechat.service.mapper.WechatTemplateMapper; import co.yixiang.utils.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveGoodsMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveGoodsMapper.java index 9628a9e9..971ec093 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveGoodsMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveGoodsMapper.java @@ -10,7 +10,6 @@ package co.yixiang.modules.wechat.service.mapper; import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; -import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; /** diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveMapper.java index 90f93968..297684a4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveMapper.java @@ -10,7 +10,6 @@ package co.yixiang.modules.wechat.service.mapper; import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.wechat.domain.YxWechatLive; -import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; /** diff --git a/yshop-message/src/main/java/co/yixiang/message/redis/listener/RedisKeyExpirationListener.java b/yshop-message/src/main/java/co/yixiang/message/redis/listener/RedisKeyExpirationListener.java index f0e6ba92..8cad7583 100644 --- a/yshop-message/src/main/java/co/yixiang/message/redis/listener/RedisKeyExpirationListener.java +++ b/yshop-message/src/main/java/co/yixiang/message/redis/listener/RedisKeyExpirationListener.java @@ -10,10 +10,8 @@ package co.yixiang.message.redis.listener; import cn.hutool.core.util.StrUtil; - import co.yixiang.constant.ShopConstants; import co.yixiang.enums.OrderInfoEnum; -import co.yixiang.enums.ShopCommonEnum; import co.yixiang.message.redis.config.RedisConfigProperties; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.service.YxStorePinkService; diff --git a/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqConsumer.java b/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqConsumer.java index dccb221b..d3c90804 100644 --- a/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqConsumer.java +++ b/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqConsumer.java @@ -8,18 +8,12 @@ */ package co.yixiang.message.rocketmq; -import cn.hutool.core.util.ObjectUtil; - import co.yixiang.enums.OrderInfoEnum; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; /** * @ClassName 消费者 diff --git a/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqProducer.java b/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqProducer.java index e48cb5ea..681ea173 100644 --- a/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqProducer.java +++ b/yshop-message/src/main/java/co/yixiang/message/rocketmq/MqProducer.java @@ -16,8 +16,6 @@ import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.exception.RemotingException; import org.apache.rocketmq.spring.core.RocketMQTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; /** * @ClassName 生成者 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 f0397b2e..c96f9953 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 @@ -13,7 +13,11 @@ import lombok.extern.slf4j.Slf4j; 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.Date; +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 55c1459f..db86471e 100644 --- a/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java +++ b/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java @@ -16,7 +16,6 @@ package co.yixiang.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; -import org.springframework.core.annotation.OrderUtils; import org.springframework.stereotype.Component; import java.sql.Timestamp; 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 7645b15c..000b42c3 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 @@ -15,7 +15,6 @@ import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; 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 ae4da573..e8b27174 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 @@ -17,7 +17,6 @@ import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProductAttrResult; import co.yixiang.modules.product.service.YxStoreProductAttrResultService; import co.yixiang.modules.product.service.YxStoreProductRuleService; -import co.yixiang.modules.product.service.dto.ProductDto; import co.yixiang.modules.product.service.dto.ProductFormatDto; import co.yixiang.modules.template.domain.YxShippingTemplates; import co.yixiang.modules.template.service.YxShippingTemplatesService; @@ -40,7 +39,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @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 883af1fb..80822b5d 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 @@ -13,7 +13,6 @@ import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.modules.activity.service.YxStoreCouponService; import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; 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 8ad0561f..fa770d17 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 @@ -5,13 +5,11 @@ */ package co.yixiang.modules.activity.rest; -import cn.hutool.core.util.ObjectUtil; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCouponIssue; import co.yixiang.modules.activity.service.YxStoreCouponIssueService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; 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 31cb29c1..2c105895 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 @@ -9,7 +9,6 @@ package co.yixiang.modules.activity.rest; import co.yixiang.logging.aop.log.Log; -import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; import co.yixiang.modules.activity.service.YxStoreCouponIssueUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; @@ -19,13 +18,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.validation.annotation.Validated; 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; 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 01b415d6..e6b5a996 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 @@ -11,7 +11,6 @@ import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; 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 18dec570..2e1a7ddb 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 @@ -19,7 +19,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; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/aop/ForbidSubmitAspect.java b/yshop-shop/src/main/java/co/yixiang/modules/aop/ForbidSubmitAspect.java index 23824c13..f0bb0b13 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/aop/ForbidSubmitAspect.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/aop/ForbidSubmitAspect.java @@ -9,8 +9,6 @@ package co.yixiang.modules.aop; -import co.yixiang.api.BusinessException; -import co.yixiang.api.YshopException; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java index 0f1eae73..8dc69130 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java @@ -11,7 +11,6 @@ package co.yixiang.modules.category.rest; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; -import co.yixiang.exception.BadRequestException; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.category.domain.YxStoreCategory; @@ -28,7 +27,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/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index ea78f665..6d1aa4de 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -40,7 +40,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 javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 67c96a53..ba146cf4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.product.rest; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.enums.SpecTypeEnum; @@ -20,7 +19,6 @@ import co.yixiang.modules.category.service.YxStoreCategoryService; import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.domain.YxStoreProductAttrResult; import co.yixiang.modules.product.service.YxStoreProductAttrResultService; -import co.yixiang.modules.product.service.YxStoreProductReplyService; import co.yixiang.modules.product.service.YxStoreProductRuleService; import co.yixiang.modules.product.service.YxStoreProductService; import co.yixiang.modules.product.service.dto.ProductDto; @@ -34,16 +32,27 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; 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.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.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java index 7cbd33aa..75ff341f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java @@ -7,26 +7,34 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.product.rest; -import java.util.ArrayList; -import java.util.Arrays; + import co.yixiang.dozer.service.IGenerator; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProductRule; import co.yixiang.modules.product.service.YxStoreProductRuleService; import co.yixiang.modules.product.service.dto.YxStoreProductRuleDto; import co.yixiang.modules.product.service.dto.YxStoreProductRuleQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; - 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.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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java index 88dbb906..4e60f15c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java @@ -12,7 +12,11 @@ import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.WxMpMassTagMessage; -import me.chanjar.weixin.mp.bean.material.*; +import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; +import me.chanjar.weixin.mp.bean.material.WxMpMaterial; +import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; +import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; +import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle; import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; 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 48c25dc7..9cfc7c65 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 @@ -9,7 +9,6 @@ package co.yixiang.modules.shop.rest; import co.yixiang.logging.aop.log.Log; - import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.YxExpressService; 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 b913ff20..e72995dd 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 @@ -16,9 +16,9 @@ import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; -import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.mp.config.WxPayConfiguration; +import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.RedisUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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 b9af63d0..73f94aba 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 @@ -14,7 +14,6 @@ import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; -import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; 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 69c82b15..143d062d 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 @@ -16,7 +16,6 @@ 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.utils.OrderUtil; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.ShopKeyUtils; import com.alibaba.fastjson.JSON; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java index b6a3a3f3..fc0e7a23 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java @@ -7,15 +7,14 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.template.rest; -import java.util.Arrays; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; +import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.service.YxStoreProductService; -import co.yixiang.modules.template.domain.YxShippingTemplates; import co.yixiang.modules.template.domain.YxSystemCity; import co.yixiang.modules.template.service.YxShippingTemplatesService; import co.yixiang.modules.template.service.YxSystemCityService; @@ -23,19 +22,27 @@ import co.yixiang.modules.template.service.dto.ShippingTemplatesDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesDto; import co.yixiang.modules.template.service.dto.YxShippingTemplatesQueryCriteria; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; import org.springframework.cache.annotation.Cacheable; 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 java.util.List; +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.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; +import java.util.List; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java index 4e78f49f..36a18312 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java @@ -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; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java index c9d016a6..e984ed35 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java @@ -10,7 +10,6 @@ import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.dto.YxSystemUserLevelQueryCriteria; -import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index f6b9f689..04eca9f6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -9,7 +9,6 @@ package co.yixiang.modules.user.rest; import co.yixiang.logging.aop.log.Log; - import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.dto.YxUserBillQueryCriteria; import io.swagger.annotations.Api; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index 15f95ac8..4c99dd8b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -7,9 +7,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.dozer.service.IGenerator; import co.yixiang.logging.aop.log.Log; - import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.modules.user.domain.YxUserRecharge; import co.yixiang.modules.user.service.YxUserRechargeService; import co.yixiang.modules.user.service.dto.YxUserRechargeDto; import co.yixiang.modules.user.service.dto.YxUserRechargeQueryCriteria; @@ -19,10 +17,8 @@ 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.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; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java index 037af87f..961ea36b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java @@ -5,7 +5,6 @@ */ package co.yixiang.modules.wechat.rest; -import cn.hutool.core.date.DateUtil; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.services.WechatArticleService; import co.yixiang.modules.wechat.domain.YxArticle; @@ -29,8 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; - /** * @author hupeng * @date 2019-10-07 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java index da4dbf89..04253d2a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java @@ -12,7 +12,6 @@ import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.wechat.domain.YxWechatMenu; import co.yixiang.modules.wechat.service.YxWechatMenuService; import co.yixiang.mp.config.WxMpConfiguration; - import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatTemplateController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatTemplateController.java index 450236af..2d59db5d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatTemplateController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatTemplateController.java @@ -6,7 +6,6 @@ package co.yixiang.modules.wechat.rest; import co.yixiang.dozer.service.IGenerator; - import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.wechat.domain.YxWechatTemplate; import co.yixiang.modules.wechat.service.YxWechatTemplateService; @@ -20,11 +19,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.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; -import java.util.Arrays; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java index 7dfaed3d..4491540c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java @@ -7,23 +7,32 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.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.wechat.domain.YxWechatLive; import co.yixiang.modules.wechat.service.YxWechatLiveService; -import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; +import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; +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/wechat/rest/YxWechatLiveGoodsController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java index 77d8dc0b..0964bcf8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java @@ -7,25 +7,33 @@ * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ package co.yixiang.modules.wechat.rest; -import java.util.Arrays; + import co.yixiang.dozer.service.IGenerator; -import co.yixiang.modules.wechat.service.WxMaLiveGoodsService; -import lombok.AllArgsConstructor; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; +import co.yixiang.modules.wechat.service.WxMaLiveGoodsService; import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService; -import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; -import me.chanjar.weixin.common.error.WxErrorException; +import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria; +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-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java b/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java index acdc4fe7..5100bcb4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java @@ -2,9 +2,6 @@ package co.yixiang.tools.config; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; -import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; -import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import cn.binarywang.wx.miniapp.message.WxMaMessageHandler; import cn.binarywang.wx.miniapp.message.WxMaMessageRouter; @@ -12,13 +9,11 @@ import co.yixiang.constant.SystemConfigConstants; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.ShopKeyUtils; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import me.chanjar.weixin.common.api.WxConsts; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; import java.util.Map; /** 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 0952da4a..de501c0a 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 @@ -6,7 +6,6 @@ package co.yixiang.tools.rest; import cn.hutool.core.util.StrUtil; -import co.yixiang.annotation.AnonymousAccess; import co.yixiang.api.YshopException; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.tools.domain.QiniuContent; @@ -16,7 +15,6 @@ import co.yixiang.tools.service.dto.LocalStorageDto; import co.yixiang.utils.RedisUtils; import io.swagger.annotations.Api; 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.PostMapping; 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 b4402da8..5e68f06b 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 @@ -16,7 +16,6 @@ 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; diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java index 56b23ef6..d5a374e1 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java @@ -5,7 +5,16 @@ */ 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.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 co.yixiang.utils.RedisUtils; import co.yixiang.utils.ShopKeyUtils; diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java index 6e1b5f0b..70051314 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java @@ -12,7 +12,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.BusinessException; import co.yixiang.api.YshopException; -import co.yixiang.enums.*; +import co.yixiang.enums.AppFromEnum; +import co.yixiang.enums.BillDetailEnum; +import co.yixiang.enums.OrderInfoEnum; +import co.yixiang.enums.PayMethodEnum; +import co.yixiang.enums.PayTypeEnum; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.user.domain.YxUser;