From a86ae8fad20a41e59f8885e3fa0d03f92ae25d1b Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 29 Dec 2019 16:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=98=BE=E7=A4=BA,=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E6=95=88import=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/mapper/YxStoreBargainMapper.java | 9 ++++---- .../mapper/YxStoreCombinationMapper.java | 10 ++++---- .../impl/YxStoreBargainServiceImpl.java | 18 ++++++--------- .../impl/YxStoreBargainUserServiceImpl.java | 17 ++++++-------- .../impl/YxStoreCombinationServiceImpl.java | 15 ++++++------ .../service/impl/YxStorePinkServiceImpl.java | 15 ++++++------ .../impl/YxStoreSeckillServiceImpl.java | 15 ++++++------ .../controller/StoreBargainController.java | 7 ------ .../StoreCombinationController.java | 7 ------ .../controller/StoreSeckillController.java | 18 +++++++-------- .../modules/activity/web/dto/PinkInfoDTO.java | 1 - .../activity/web/dto/StoreCombinationDTO.java | 5 ---- .../activity/web/dto/StoreSeckillDTO.java | 1 - .../web/vo/YxStoreBargainQueryVo.java | 3 --- .../web/vo/YxStoreBargainUserHelpQueryVo.java | 2 -- .../web/vo/YxStoreBargainUserQueryVo.java | 2 -- .../activity/web/vo/YxStorePinkQueryVo.java | 2 -- .../web/vo/YxStoreSeckillQueryVo.java | 3 +-- .../modules/manage/entity/YxExpress.java | 4 +--- .../web/controller/ShoperController.java | 3 --- .../manage/web/param/OrderRemarkParam.java | 1 - .../manage/web/vo/YxExpressQueryVo.java | 3 +-- .../modules/order/entity/YxStoreOrder.java | 6 ++--- .../order/entity/YxStoreOrderCartInfo.java | 4 +--- .../order/entity/YxStoreOrderStatus.java | 4 +--- .../service/YxStoreOrderCartInfoService.java | 6 +---- .../service/YxStoreOrderStatusService.java | 7 +----- .../web/controller/StoreOrderController.java | 8 +++---- .../order/web/dto/OrderCartInfoDTO.java | 3 --- .../modules/order/web/dto/OrderExtendDTO.java | 1 - .../modules/order/web/param/ExpressParam.java | 1 - .../modules/order/web/param/OrderParam.java | 1 - .../web/vo/YxStoreOrderCartInfoQueryVo.java | 2 -- .../order/web/vo/YxStoreOrderQueryVo.java | 2 -- .../web/vo/YxStoreOrderStatusQueryVo.java | 2 -- .../rest/AuthenticationController.java | 14 +++++------ .../service/JwtPermissionService.java | 6 ----- .../service/JwtUserDetailsService.java | 2 -- .../modules/shop/entity/YxStoreCart.java | 4 +--- .../modules/shop/entity/YxStoreCategory.java | 4 +--- .../modules/shop/entity/YxStoreCoupon.java | 5 ++-- .../shop/entity/YxStoreCouponIssue.java | 4 +--- .../shop/entity/YxStoreCouponIssueUser.java | 4 +--- .../shop/entity/YxStoreCouponUser.java | 6 ++--- .../modules/shop/entity/YxStoreProduct.java | 6 ++--- .../shop/entity/YxStoreProductAttr.java | 4 +--- .../shop/entity/YxStoreProductAttrResult.java | 4 +--- .../shop/entity/YxStoreProductAttrValue.java | 6 ++--- .../shop/entity/YxStoreProductRelation.java | 4 +--- .../shop/entity/YxStoreProductReply.java | 3 +-- .../modules/shop/entity/YxSystemConfig.java | 4 +--- .../shop/entity/YxSystemGroupData.java | 4 +--- .../shop/mapper/YxStoreCouponIssueMapper.java | 7 +++--- .../modules/shop/mapping/CategoryMap.java | 2 -- .../modules/shop/mapping/ProductAttrMap.java | 2 -- .../shop/service/YxStoreCartService.java | 4 +--- .../shop/service/YxStoreCategoryService.java | 4 +--- .../service/YxStoreProductAttrService.java | 6 +---- .../shop/service/YxSystemConfigService.java | 7 +----- .../service/YxSystemGroupDataService.java | 6 +---- .../web/controller/ArticleController.java | 5 ---- .../shop/web/controller/CouponController.java | 5 ---- .../shop/web/controller/IndexController.java | 5 ---- .../web/controller/StoreCartController.java | 9 -------- .../controller/StoreCategoryController.java | 8 ++----- .../controller/StoreProductController.java | 5 ---- .../modules/shop/web/dto/ProductDTO.java | 6 +++-- .../shop/web/param/YxStoreCartQueryParam.java | 3 --- .../modules/shop/web/vo/YxArticleQueryVo.java | 2 -- .../shop/web/vo/YxStoreCartQueryVo.java | 3 --- .../shop/web/vo/YxStoreCategoryQueryVo.java | 3 +-- .../web/vo/YxStoreCouponIssueQueryVo.java | 2 -- .../web/vo/YxStoreCouponIssueUserQueryVo.java | 3 +-- .../shop/web/vo/YxStoreCouponQueryVo.java | 3 +-- .../shop/web/vo/YxStoreCouponUserQueryVo.java | 2 -- .../vo/YxStoreProductAttrResultQueryVo.java | 3 +-- .../vo/YxStoreProductAttrValueQueryVo.java | 2 -- .../shop/web/vo/YxStoreProductQueryVo.java | 2 -- .../web/vo/YxStoreProductRelationQueryVo.java | 2 -- .../web/vo/YxStoreProductReplyQueryVo.java | 3 --- .../shop/web/vo/YxSystemConfigQueryVo.java | 3 +-- .../shop/web/vo/YxSystemGroupDataQueryVo.java | 3 +-- .../user/entity/YxSystemAttachment.java | 4 +--- .../user/entity/YxSystemUserLevel.java | 6 ++--- .../modules/user/entity/YxSystemUserTask.java | 4 +--- .../yixiang/modules/user/entity/YxUser.java | 6 ++--- .../modules/user/entity/YxUserAddress.java | 4 +--- .../modules/user/entity/YxUserBill.java | 6 ++--- .../modules/user/entity/YxUserExtract.java | 6 ++--- .../modules/user/entity/YxUserLevel.java | 4 +--- .../modules/user/entity/YxUserRecharge.java | 6 ++--- .../modules/user/entity/YxUserSign.java | 4 +--- .../modules/user/entity/YxUserTaskFinish.java | 4 +--- .../modules/user/entity/YxWechatUser.java | 6 ++--- .../user/service/YxUserBillService.java | 5 ++-- .../modules/user/service/YxUserService.java | 5 ++-- .../impl/YxUserRechargeServiceImpl.java | 15 ++++++------ .../user/service/impl/YxUserServiceImpl.java | 17 ++++++-------- .../service/impl/YxUserSignServiceImpl.java | 15 ++++++------ .../web/controller/UserAddressController.java | 1 - .../web/controller/UserBillController.java | 2 -- .../user/web/controller/UserController.java | 11 ++++----- .../web/controller/UserExtractController.java | 7 +++--- .../web/controller/UserLevelController.java | 11 +++------ .../controller/UserRechargeController.java | 10 -------- .../web/controller/WechatController.java | 4 ---- .../web/controller/WxMaUserController.java | 14 ++++------- .../mp/controller/WxPortalController.java | 15 ++---------- .../mp/controller/WxRedirectController.java | 4 ---- .../mp/controller/YxArticleController.java | 2 -- .../mp/controller/YxCacheController.java | 2 -- .../controller/YxWechatReplyController.java | 3 --- .../YxWechatTemplateController.java | 5 ++-- .../mp/service/YxWechatTemplateService.java | 6 ++--- .../rest/YxStoreBargainController.java | 5 ++-- .../rest/YxStoreCombinationController.java | 5 ++-- .../rest/YxStoreSeckillController.java | 5 ++-- .../rest/YxUserExtractController.java | 4 ++-- .../impl/YxStoreCombinationServiceImpl.java | 13 +++++------ .../impl/YxStoreCouponUserServiceImpl.java | 17 +++++++------- .../service/impl/YxStorePinkServiceImpl.java | 19 ++++++++------- .../impl/YxStoreSeckillServiceImpl.java | 13 +++++------ .../shop/rest/YxExpressController.java | 5 ++-- .../shop/rest/YxStoreCategoryController.java | 6 ++--- .../shop/rest/YxStoreProductController.java | 10 ++++---- .../rest/YxSystemGroupDataController.java | 4 ++-- .../rest/YxSystemUserLevelController.java | 5 ++-- .../shop/rest/YxSystemUserTaskController.java | 5 ++-- .../shop/rest/YxUserBillController.java | 9 ++++---- .../modules/shop/rest/YxUserController.java | 10 ++++---- .../service/impl/YxStoreOrderServiceImpl.java | 11 ++++----- .../impl/YxStoreProductReplyServiceImpl.java | 15 +++++------- .../impl/YxStoreProductServiceImpl.java | 23 +++++++++---------- .../impl/YxSystemGroupDataServiceImpl.java | 10 ++++---- .../impl/YxSystemUserTaskServiceImpl.java | 13 +++++------ .../service/impl/YxUserBillServiceImpl.java | 12 ++++------ 136 files changed, 272 insertions(+), 573 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainMapper.java index 8ea270eb..c7570049 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreBargainMapper.java @@ -1,13 +1,12 @@ package co.yixiang.modules.activity.mapper; -import co.yixiang.modules.activity.web.dto.TopCountDTO; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.modules.activity.web.param.YxStoreBargainQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; +import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreCombinationMapper.java b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreCombinationMapper.java index 97334edb..48230c0d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreCombinationMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/mapper/YxStoreCombinationMapper.java @@ -1,14 +1,12 @@ package co.yixiang.modules.activity.mapper; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.modules.activity.web.param.YxStoreCombinationQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; +import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 568e91fd..50c2fd51 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -2,7 +2,8 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.RandomUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.modules.activity.entity.YxStoreBargainUser; @@ -17,27 +18,22 @@ import co.yixiang.modules.activity.web.dto.BargainDTO; import co.yixiang.modules.activity.web.dto.TopCountDTO; import co.yixiang.modules.activity.web.param.YxStoreBargainQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; import co.yixiang.modules.order.entity.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.List; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java index 14408e5e..deab2995 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java @@ -2,6 +2,8 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; @@ -13,24 +15,19 @@ import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.web.param.YxStoreBargainUserQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.List; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index a55ae59f..b4d1d9fb 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -1,6 +1,8 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.modules.activity.mapper.YxStoreCombinationMapper; @@ -10,19 +12,16 @@ import co.yixiang.modules.activity.web.dto.PinkDTO; import co.yixiang.modules.activity.web.dto.StoreCombinationDTO; import co.yixiang.modules.activity.web.param.YxStoreCombinationQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.service.YxStoreProductReplyService; -import co.yixiang.utils.SecurityUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index f6c00268..38797237 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -2,6 +2,8 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.mapper.YxStoreCombinationMapper; @@ -14,8 +16,6 @@ import co.yixiang.modules.activity.web.dto.PinkInfoDTO; import co.yixiang.modules.activity.web.param.YxStorePinkQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.entity.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.param.RefundParam; @@ -25,17 +25,16 @@ import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.util.*; -import java.util.stream.Collectors; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index 8d7d925c..7da958bd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -2,8 +2,9 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.modules.activity.entity.YxStoreSeckill; import co.yixiang.modules.activity.mapper.YxStoreSeckillMapper; import co.yixiang.modules.activity.mapping.StoreSeckillMap; @@ -11,19 +12,17 @@ import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.web.dto.StoreSeckillDTO; import co.yixiang.modules.activity.web.param.YxStoreSeckillQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreSeckillQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.service.YxStoreProductReplyService; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index 4b6fa18f..eb71a3a6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -10,19 +10,13 @@ import cn.hutool.http.HttpUtil; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.activity.entity.YxStoreBargain; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; -import co.yixiang.modules.activity.entity.YxStorePink; 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.web.param.YxStoreBargainQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreBargainQueryVo; import co.yixiang.modules.activity.web.vo.YxStoreBargainUserQueryVo; -import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxSystemAttachment; import co.yixiang.modules.user.service.YxSystemAttachmentService; @@ -41,7 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.awt.*; import java.io.File; import java.io.IOException; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index d2d9d4b6..a6023e3c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -9,13 +9,9 @@ import cn.hutool.http.HttpUtil; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.activity.entity.YxStoreCombination; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.activity.web.param.YxStoreCombinationQueryParam; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxSystemAttachment; @@ -34,14 +30,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.awt.*; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java index 28541b97..0b3cd474 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreSeckillController.java @@ -3,13 +3,12 @@ package co.yixiang.modules.activity.web.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.aop.log.Log; +import co.yixiang.common.api.ApiResult; +import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.web.dto.SeckillConfigDTO; import co.yixiang.modules.activity.web.dto.SeckillTimeDTO; import co.yixiang.modules.activity.web.vo.YxStoreSeckillQueryVo; -import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.api.ApiResult; import co.yixiang.modules.shop.entity.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.utils.OrderUtil; @@ -24,9 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; /** *

@@ -55,17 +55,17 @@ public class StoreSeckillController extends BaseController { public ApiResult getYxStoreSeckillPageList(@PathVariable String time, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit) throws Exception { - if(StrUtil.isBlank(time)) return ApiResult.fail("参数错误"); + if (StrUtil.isBlank(time)) return ApiResult.fail("参数错误"); YxSystemGroupData systemGroupData = yxSystemGroupDataService .findData(Integer.valueOf(time)); - if(ObjectUtil.isNull(systemGroupData)) return ApiResult.fail("参数错误"); + if (ObjectUtil.isNull(systemGroupData)) return ApiResult.fail("参数错误"); int today = OrderUtil.dateToTimestampT(DateUtil.beginOfDay(new Date()));//今天开始的时间戳 JSONObject jsonObject = JSONObject.parseObject(systemGroupData.getValue()); int startTime = today + (jsonObject.getInteger("time") * 3600); - int endTime = today + ((jsonObject.getInteger("time")+jsonObject.getInteger("continued")) * 3600); + int endTime = today + ((jsonObject.getInteger("time") + jsonObject.getInteger("continued")) * 3600); - return ApiResult.ok(yxStoreSeckillService.getList(page,limit,startTime,endTime)); + return ApiResult.ok(yxStoreSeckillService.getList(page, limit, startTime, endTime)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/PinkInfoDTO.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/PinkInfoDTO.java index 30cd951d..400f625f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/PinkInfoDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/PinkInfoDTO.java @@ -1,6 +1,5 @@ package co.yixiang.modules.activity.web.dto; -import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo; import co.yixiang.modules.user.web.vo.YxUserQueryVo; diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreCombinationDTO.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreCombinationDTO.java index e2c2ec1b..af9a5032 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreCombinationDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreCombinationDTO.java @@ -2,14 +2,9 @@ package co.yixiang.modules.activity.web.dto; import co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreSeckillDTO.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreSeckillDTO.java index eb1e4238..fc53a1ea 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreSeckillDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreSeckillDTO.java @@ -6,7 +6,6 @@ import lombok.Builder; import lombok.Data; import java.io.Serializable; -import java.util.List; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainQueryVo.java index fa3a5681..de7061ea 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainQueryVo.java @@ -1,14 +1,11 @@ package co.yixiang.modules.activity.web.vo; -import co.yixiang.modules.user.web.vo.YxUserQueryVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserHelpQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserHelpQueryVo.java index f02f4507..97158259 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserHelpQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserHelpQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserQueryVo.java index 08e4fbec..7a3c9f43 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreBargainUserQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStorePinkQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStorePinkQueryVo.java index b87448fe..95b39dc1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStorePinkQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStorePinkQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreSeckillQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreSeckillQueryVo.java index 79e2d86a..458009ee 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreSeckillQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/vo/YxStoreSeckillQueryVo.java @@ -4,12 +4,11 @@ import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; +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-api/src/main/java/co/yixiang/modules/manage/entity/YxExpress.java b/yshop-api/src/main/java/co/yixiang/modules/manage/entity/YxExpress.java index 1a0b1e0e..b754e192 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/entity/YxExpress.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/entity/YxExpress.java @@ -1,15 +1,13 @@ package co.yixiang.modules.manage.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 快递公司表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java index e22b8a6f..749eca92 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/controller/ShoperController.java @@ -9,12 +9,9 @@ import co.yixiang.modules.manage.web.dto.OrderTimeDataDTO; import co.yixiang.modules.manage.web.param.OrderDeliveryParam; import co.yixiang.modules.manage.web.param.OrderPriceParam; import co.yixiang.modules.manage.web.param.OrderRefundParam; -import co.yixiang.modules.manage.web.param.OrderRemarkParam; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.dto.OrderCountDTO; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; -import co.yixiang.modules.user.service.YxUserService; -import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/OrderRemarkParam.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/OrderRemarkParam.java index d51ee994..688fdc82 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/OrderRemarkParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/param/OrderRemarkParam.java @@ -3,7 +3,6 @@ package co.yixiang.modules.manage.web.param; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/manage/web/vo/YxExpressQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/manage/web/vo/YxExpressQueryVo.java index 36848d01..c3f6c47b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/manage/web/vo/YxExpressQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/manage/web/vo/YxExpressQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.manage.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java index c3f18855..be24bd32 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java @@ -1,9 +1,7 @@ package co.yixiang.modules.order.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -11,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderCartInfo.java b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderCartInfo.java index 7f36b471..f2554e32 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderCartInfo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderCartInfo.java @@ -1,7 +1,7 @@ package co.yixiang.modules.order.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 订单购物详情表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderStatus.java b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderStatus.java index 74eb1367..0f5ca153 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderStatus.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrderStatus.java @@ -1,15 +1,13 @@ package co.yixiang.modules.order.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 订单操作记录表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java index facca1ac..6e439f7e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderCartInfoService.java @@ -1,13 +1,9 @@ package co.yixiang.modules.order.service; -import co.yixiang.modules.order.entity.YxStoreOrderCartInfo; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.order.web.param.YxStoreOrderCartInfoQueryParam; -import co.yixiang.modules.order.web.vo.YxStoreOrderCartInfoQueryVo; -import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.order.entity.YxStoreOrderCartInfo; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; -import java.io.Serializable; import java.util.List; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java index 4957dd78..b8e661d1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderStatusService.java @@ -1,12 +1,7 @@ package co.yixiang.modules.order.service; -import co.yixiang.modules.order.entity.YxStoreOrderStatus; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.order.web.param.YxStoreOrderStatusQueryParam; -import co.yixiang.modules.order.web.vo.YxStoreOrderStatusQueryVo; -import co.yixiang.common.web.vo.Paging; - -import java.io.Serializable; +import co.yixiang.modules.order.entity.YxStoreOrderStatus; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java index 97348e0e..24f1a000 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java @@ -5,8 +5,6 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.express.ExpressService; import co.yixiang.express.dao.ExpressInfo; @@ -19,7 +17,10 @@ import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; import co.yixiang.modules.order.web.dto.*; -import co.yixiang.modules.order.web.param.*; +import co.yixiang.modules.order.web.param.ExpressParam; +import co.yixiang.modules.order.web.param.OrderParam; +import co.yixiang.modules.order.web.param.PayParam; +import co.yixiang.modules.order.web.param.RefundParam; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import co.yixiang.modules.shop.entity.YxStoreProductReply; import co.yixiang.modules.shop.service.YxStoreCartService; @@ -41,7 +42,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.parameters.P; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderCartInfoDTO.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderCartInfoDTO.java index 0fc3de40..a6c6c3fd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderCartInfoDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderCartInfoDTO.java @@ -1,8 +1,5 @@ package co.yixiang.modules.order.web.dto; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderExtendDTO.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderExtendDTO.java index b636ce06..9f965d8b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderExtendDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/OrderExtendDTO.java @@ -1,6 +1,5 @@ package co.yixiang.modules.order.web.dto; -import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import lombok.Data; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/ExpressParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/ExpressParam.java index 811b6f73..12e8eb1c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/ExpressParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/ExpressParam.java @@ -2,7 +2,6 @@ package co.yixiang.modules.order.web.param; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderParam.java index ffb5a3e7..a38c7521 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderParam.java @@ -1,6 +1,5 @@ package co.yixiang.modules.order.web.param; -import io.swagger.models.auth.In; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderCartInfoQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderCartInfoQueryVo.java index ad7ba2a9..89f910e7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderCartInfoQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderCartInfoQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 订单购物详情表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java index 64a3b39d..68ff5ba1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java @@ -7,9 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; import java.util.List; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderStatusQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderStatusQueryVo.java index 41d7ea21..882bcfe7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderStatusQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderStatusQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 订单操作记录表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java index 03fde06e..ed7b3d33 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java @@ -5,33 +5,31 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; import co.yixiang.modules.monitor.service.RedisService; import co.yixiang.modules.security.rest.param.RegParam; import co.yixiang.modules.security.rest.param.VerityParam; +import co.yixiang.modules.security.security.AuthorizationUser; import co.yixiang.modules.security.security.JwtUser; +import co.yixiang.modules.security.utils.JwtTokenUtil; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.SecurityUtils; -import com.vdurmont.emoji.EmojiParser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import co.yixiang.aop.log.Log; -import co.yixiang.modules.security.security.AuthenticationInfo; -import co.yixiang.modules.security.security.AuthorizationUser; -import co.yixiang.modules.security.utils.JwtTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AccountExpiredException; 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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtPermissionService.java b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtPermissionService.java index 1931eb5b..bbe65a37 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtPermissionService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtPermissionService.java @@ -2,17 +2,11 @@ package co.yixiang.modules.security.service; import co.yixiang.modules.user.entity.YxUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collection; -import java.util.Set; -import java.util.stream.Collectors; @Service //@CacheConfig(cacheNames = "role") diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java index 0e3fec33..15879e86 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java @@ -12,8 +12,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - /** * @author hupeng * @since 2019-10-16 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCart.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCart.java index 9f34e7dd..d3389c36 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCart.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCart.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 购物车表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCategory.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCategory.java index f9518cdf..10491797 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCategory.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCategory.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 商品分类表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCoupon.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCoupon.java index 6311ac8b..1188bd40 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCoupon.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCoupon.java @@ -1,15 +1,14 @@ package co.yixiang.modules.shop.entity; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssue.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssue.java index fbdffd16..da88034e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssue.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssue.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 优惠券前台领取表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssueUser.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssueUser.java index 2ad46180..89b137bb 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssueUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponIssueUser.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 优惠券前台用户领取记录表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponUser.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponUser.java index ab123a80..425bf5bd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreCouponUser.java @@ -1,16 +1,14 @@ package co.yixiang.modules.shop.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProduct.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProduct.java index 57b087f8..b5d515a5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProduct.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProduct.java @@ -1,16 +1,14 @@ package co.yixiang.modules.shop.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttr.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttr.java index 70388e1c..b832ab67 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttr.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttr.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 商品属性表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrResult.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrResult.java index e7aa8515..d3ba1688 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrResult.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrResult.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 商品属性详情表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrValue.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrValue.java index 56df9dab..2d7450ff 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrValue.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductAttrValue.java @@ -1,9 +1,7 @@ package co.yixiang.modules.shop.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -11,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductRelation.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductRelation.java index f6c84f21..3d1b2d73 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductRelation.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductRelation.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 商品点赞和收藏表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductReply.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductReply.java index 7a15d794..9124f409 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductReply.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxStoreProductReply.java @@ -1,7 +1,7 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -10,7 +10,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemConfig.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemConfig.java index 9ce8efbd..93f8c692 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemConfig.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemConfig.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 配置表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemGroupData.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemGroupData.java index ec14330a..74d1a30f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemGroupData.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemGroupData.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 组合数据详情表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueMapper.java index 4a14fc51..123c0e69 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueMapper.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreCouponIssueMapper.java @@ -1,12 +1,11 @@ package co.yixiang.modules.shop.mapper; -import co.yixiang.modules.shop.web.vo.YxStoreProductRelationQueryVo; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import co.yixiang.modules.shop.entity.YxStoreCouponIssue; import co.yixiang.modules.shop.web.param.YxStoreCouponIssueQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCouponIssueQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/CategoryMap.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/CategoryMap.java index daab9d33..79058113 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/CategoryMap.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/CategoryMap.java @@ -2,8 +2,6 @@ package co.yixiang.modules.shop.mapping; import co.yixiang.mapper.EntityMapper; import co.yixiang.modules.shop.entity.YxStoreCategory; -import co.yixiang.modules.shop.entity.YxStoreProduct; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.utils.CateDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/ProductAttrMap.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/ProductAttrMap.java index ed07dd45..a827a8b7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/ProductAttrMap.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/ProductAttrMap.java @@ -1,10 +1,8 @@ package co.yixiang.modules.shop.mapping; import co.yixiang.mapper.EntityMapper; -import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.entity.YxStoreProductAttr; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; -import co.yixiang.utils.CateDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java index a55482a6..0cc5d93a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java @@ -1,10 +1,8 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; +import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java index b784385b..b048e27c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java @@ -1,10 +1,8 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.shop.web.param.YxStoreCategoryQueryParam; +import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.web.vo.YxStoreCategoryQueryVo; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.CateDTO; import java.io.Serializable; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java index 97bc3577..3f544ca6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java @@ -1,13 +1,9 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxStoreProductAttr; import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.entity.YxStoreProductAttr; import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; -import co.yixiang.modules.shop.web.param.YxStoreProductAttrQueryParam; -import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; -import co.yixiang.common.web.vo.Paging; -import java.io.Serializable; import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java index e5bcdbb1..15cea817 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java @@ -1,12 +1,7 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxSystemConfig; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.shop.web.param.YxSystemConfigQueryParam; -import co.yixiang.modules.shop.web.vo.YxSystemConfigQueryVo; -import co.yixiang.common.web.vo.Paging; - -import java.io.Serializable; +import co.yixiang.modules.shop.entity.YxSystemConfig; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java index 59eb25b5..65d26425 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java @@ -1,12 +1,8 @@ package co.yixiang.modules.shop.service; -import co.yixiang.modules.shop.entity.YxSystemGroupData; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.shop.web.param.YxSystemGroupDataQueryParam; -import co.yixiang.modules.shop.web.vo.YxSystemGroupDataQueryVo; -import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.shop.entity.YxSystemGroupData; -import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java index 6e5a34ce..847e07cc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/ArticleController.java @@ -2,10 +2,7 @@ package co.yixiang.modules.shop.web.controller; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; import co.yixiang.common.web.vo.Paging; -import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.shop.entity.YxArticle; import co.yixiang.modules.shop.service.ArticleService; import co.yixiang.modules.shop.web.param.YxArticleQueryParam; import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; @@ -15,8 +12,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** *

* 文章 前端控制器 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java index a362a585..b84eda74 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/CouponController.java @@ -4,12 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.service.YxArticleService; import co.yixiang.modules.shop.service.YxStoreCouponIssueService; import co.yixiang.modules.shop.service.YxStoreCouponUserService; -import co.yixiang.modules.shop.web.param.YxArticleQueryParam; -import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreCouponUserQueryVo; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; @@ -21,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java index c9d79841..39987bc7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java @@ -1,13 +1,9 @@ package co.yixiang.modules.shop.web.controller; import co.yixiang.common.api.ApiResult; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.service.YxArticleService; import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.YxSystemGroupDataService; -import co.yixiang.modules.shop.web.param.YxArticleQueryParam; -import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -16,7 +12,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java index 53e82c6f..9f79708d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCartController.java @@ -4,18 +4,11 @@ import cn.hutool.core.util.ObjectUtil; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.modules.shop.service.YxStoreCartService; import co.yixiang.modules.shop.web.param.CartIdsParm; -import co.yixiang.modules.shop.web.param.YxStoreCartQueryParam; -import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; import co.yixiang.utils.SecurityUtils; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonArray; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -24,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java index 509861f5..b421a887 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java @@ -2,19 +2,15 @@ package co.yixiang.modules.shop.web.controller; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.entity.YxStoreCategory; import co.yixiang.modules.shop.service.YxStoreCategoryService; -import co.yixiang.modules.shop.web.param.YxStoreCategoryQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreCategoryQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index e54aad63..c38c0e3b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -3,16 +3,12 @@ package co.yixiang.modules.shop.web.controller; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.shop.entity.YxStoreProduct; import co.yixiang.modules.shop.service.YxStoreProductRelationService; import co.yixiang.modules.shop.service.YxStoreProductReplyService; import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.param.YxStoreProductRelationQueryParam; -import co.yixiang.modules.shop.web.vo.YxArticleQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; @@ -23,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java index ba65ffa3..2ad83ab3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java @@ -5,11 +5,13 @@ import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; -import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java index a7ca3740..f8d6a732 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreCartQueryParam.java @@ -2,9 +2,6 @@ package co.yixiang.modules.shop.web.param; import io.swagger.annotations.ApiModel; import lombok.Data; -import lombok.EqualsAndHashCode; - -import co.yixiang.common.web.param.QueryParam; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxArticleQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxArticleQueryVo.java index 4c750923..1434e088 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxArticleQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxArticleQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 文章管理表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCartQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCartQueryVo.java index f644f30e..7e2a2302 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCartQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCartQueryVo.java @@ -3,12 +3,9 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.omg.CORBA.PRIVATE_MEMBER; import java.io.Serializable; -import java.util.Date; - /** *

* 购物车表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCategoryQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCategoryQueryVo.java index fe89d58d..eda37cb2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCategoryQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCategoryQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueQueryVo.java index 3f4257be..06c8ffb8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 优惠券前台领取表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueUserQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueUserQueryVo.java index 189dcaba..3bf5b411 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueUserQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponIssueUserQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponQueryVo.java index b04a7dff..dd321146 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponQueryVo.java @@ -3,10 +3,9 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; +import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponUserQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponUserQueryVo.java index e369fbb6..75881077 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponUserQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreCouponUserQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrResultQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrResultQueryVo.java index 792243e4..491a37c5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrResultQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrResultQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrValueQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrValueQueryVo.java index 8054e48c..7aea1f2c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrValueQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductAttrValueQueryVo.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; - import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductQueryVo.java index 1d4aeaca..25bb86a5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductQueryVo.java @@ -7,11 +7,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductRelationQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductRelationQueryVo.java index 20a132e5..b6a88dba 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductRelationQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductRelationQueryVo.java @@ -6,8 +6,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; - /** *

* 商品点赞和收藏表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java index ec17a3f6..1c0ab1c9 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java @@ -8,9 +8,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; - /** *

* 评论表 查询结果对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemConfigQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemConfigQueryVo.java index 2bd680a4..b176a649 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemConfigQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemConfigQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemGroupDataQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemGroupDataQueryVo.java index 7b4805a9..46185ddf 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemGroupDataQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemGroupDataQueryVo.java @@ -3,9 +3,8 @@ package co.yixiang.modules.shop.web.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.util.Date; +import java.io.Serializable; import java.util.Map; /** diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemAttachment.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemAttachment.java index 97093a59..ddbfb80a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemAttachment.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemAttachment.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 附件管理表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserLevel.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserLevel.java index 98b7bc48..07c884a1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserLevel.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserLevel.java @@ -1,9 +1,7 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; @@ -11,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserTask.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserTask.java index 5fc2d9c8..cb6d6017 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserTask.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxSystemUserTask.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 等级任务设置 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUser.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUser.java index cbcf4551..837dce33 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUser.java @@ -1,16 +1,14 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserAddress.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserAddress.java index f3a4f0b7..838ef0cf 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserAddress.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserAddress.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 用户地址表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserBill.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserBill.java index f101f02a..167c5e9d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserBill.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserBill.java @@ -1,16 +1,14 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserExtract.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserExtract.java index e9d4d652..d22b21f2 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserExtract.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserExtract.java @@ -1,16 +1,14 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserLevel.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserLevel.java index 6fad172a..0ef03512 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserLevel.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserLevel.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 用户等级记录表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserRecharge.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserRecharge.java index c2c2a8fc..f80b2f4e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserRecharge.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserRecharge.java @@ -1,16 +1,14 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserSign.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserSign.java index a0411ecd..0a76c7a1 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserSign.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserSign.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 签到记录表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserTaskFinish.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserTaskFinish.java index e1724f00..c4c658ce 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserTaskFinish.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxUserTaskFinish.java @@ -1,15 +1,13 @@ package co.yixiang.modules.user.entity; -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** *

* 用户任务完成记录表 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxWechatUser.java b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxWechatUser.java index a5763103..add98fb6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxWechatUser.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/entity/YxWechatUser.java @@ -1,16 +1,14 @@ package co.yixiang.modules.user.entity; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.IdType; import co.yixiang.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.math.BigDecimal; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java index cac1fafd..9486afe0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java @@ -1,12 +1,11 @@ package co.yixiang.modules.user.service; -import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; +import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.web.dto.BillDTO; import co.yixiang.modules.user.web.param.YxUserBillQueryParam; import co.yixiang.modules.user.web.vo.YxUserBillQueryVo; -import co.yixiang.common.web.vo.Paging; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserService.java index aaa01101..e0dc293f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserService.java @@ -1,14 +1,13 @@ package co.yixiang.modules.user.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import co.yixiang.modules.user.entity.YxUser; -import co.yixiang.common.service.BaseService; import co.yixiang.modules.user.web.dto.PromUserDTO; -import co.yixiang.modules.user.web.dto.UserRankDTO; import co.yixiang.modules.user.web.param.PromParam; import co.yixiang.modules.user.web.param.YxUserQueryParam; import co.yixiang.modules.user.web.vo.YxUserQueryVo; -import co.yixiang.common.web.vo.Paging; import java.io.Serializable; import java.util.List; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java index b64d27ff..195164d7 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java @@ -1,23 +1,22 @@ package co.yixiang.modules.user.service.impl; -import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.modules.user.mapper.YxUserRechargeMapper; import co.yixiang.modules.user.service.YxUserRechargeService; import co.yixiang.modules.user.web.param.RechargeParam; import co.yixiang.modules.user.web.param.YxUserRechargeQueryParam; import co.yixiang.modules.user.web.vo.YxUserRechargeQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index eea55c13..62e0aef0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -3,7 +3,8 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.ErrorRequestException; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; import co.yixiang.modules.shop.service.YxSystemConfigService; @@ -11,27 +12,23 @@ import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxUserLevel; import co.yixiang.modules.user.mapper.YxUserMapper; -import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserLevelService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.dto.PromUserDTO; -import co.yixiang.modules.user.web.dto.UserRankDTO; import co.yixiang.modules.user.web.param.PromParam; import co.yixiang.modules.user.web.param.YxUserQueryParam; import co.yixiang.modules.user.web.vo.YxUserQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java index f844c44c..6195232c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java @@ -1,9 +1,10 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.common.web.vo.Paging; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.user.entity.YxUser; @@ -18,18 +19,16 @@ import co.yixiang.modules.user.web.dto.SignDTO; import co.yixiang.modules.user.web.param.YxUserSignQueryParam; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.modules.user.web.vo.YxUserSignQueryVo; -import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.common.web.vo.Paging; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java index e0fe3b80..715ea4aa 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java @@ -14,7 +14,6 @@ import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.SecurityUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index b5280f34..05964cd8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -26,13 +26,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.util.ResourceUtils; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.awt.*; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java index 49d6d8b2..250ca54c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserController.java @@ -3,14 +3,13 @@ package co.yixiang.modules.user.web.controller; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.shop.service.YxStoreProductRelationService; import co.yixiang.modules.shop.service.YxSystemGroupDataService; -import co.yixiang.modules.user.entity.YxUser; -import co.yixiang.modules.user.service.*; -import co.yixiang.modules.user.web.param.YxUserQueryParam; +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.web.vo.YxSystemUserLevelQueryVo; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.utils.SecurityUtils; @@ -20,11 +19,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.omg.CORBA.PRIVATE_MEMBER; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.locks.Lock; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java index 546e1c06..bf02c92a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserExtractController.java @@ -2,10 +2,8 @@ package co.yixiang.modules.user.web.controller; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.shop.service.YxSystemConfigService; -import co.yixiang.modules.user.entity.YxUserExtract; import co.yixiang.modules.user.service.YxUserExtractService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.web.param.UserExtParam; @@ -18,7 +16,10 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.LinkedHashMap; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java index 78ef383b..8a31fe85 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserLevelController.java @@ -3,23 +3,18 @@ package co.yixiang.modules.user.web.controller; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.user.entity.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.web.param.YxUserLevelQueryParam; -import co.yixiang.modules.user.web.vo.YxUserLevelQueryVo; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; /** *

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java index f2017d2d..26c44f23 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java @@ -1,18 +1,9 @@ package co.yixiang.modules.user.web.controller; -import cn.hutool.core.util.StrUtil; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.common.web.param.IdParam; -import co.yixiang.common.web.vo.Paging; -import co.yixiang.modules.user.entity.YxUserAddress; -import co.yixiang.modules.user.entity.YxUserRecharge; import co.yixiang.modules.user.service.YxUserRechargeService; -import co.yixiang.modules.user.web.param.AddressParam; import co.yixiang.modules.user.web.param.RechargeParam; -import co.yixiang.modules.user.web.param.YxUserRechargeQueryParam; -import co.yixiang.modules.user.web.vo.YxUserRechargeQueryVo; -import co.yixiang.utils.OrderUtil; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +12,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index c87850c5..c9d81528 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.common.api.ApiCode; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; -import co.yixiang.modules.manage.web.param.OrderRefundParam; import co.yixiang.modules.order.entity.YxStoreOrder; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; @@ -15,7 +14,6 @@ import co.yixiang.modules.security.utils.JwtTokenUtil; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxWechatUser; -import co.yixiang.modules.user.mapper.YxUserMapper; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.vo.YxUserQueryVo; @@ -31,7 +29,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; @@ -48,7 +45,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.util.Date; import java.util.LinkedHashMap; diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java index de9c2e3c..dc857274 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java @@ -3,7 +3,6 @@ package co.yixiang.modules.wechat.web.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; -import cn.binarywang.wx.miniapp.config.WxMaConfig; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,7 +10,6 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.common.api.ApiCode; import co.yixiang.common.api.ApiResult; import co.yixiang.exception.ErrorRequestException; -import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.security.security.JwtUser; import co.yixiang.modules.security.utils.JwtTokenUtil; import co.yixiang.modules.user.entity.YxUser; @@ -19,31 +17,27 @@ import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.vo.YxUserQueryVo; -import co.yixiang.mp.utils.JsonUtils; import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.chanjar.weixin.common.bean.WxAccessToken; -import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; +import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.web.bind.annotation.*; - - -import me.chanjar.weixin.common.error.WxErrorException; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; -import java.util.concurrent.locks.Lock; /** * 微信小程序用户接口 diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WxPortalController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WxPortalController.java index 313cfe3e..79bd9c55 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WxPortalController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WxPortalController.java @@ -1,24 +1,13 @@ package co.yixiang.mp.controller; import lombok.AllArgsConstructor; -import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.mp.api.WxMpMessageRouter; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -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 me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.*; /** * @author Binary Wang(https://github.com/binarywang) diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WxRedirectController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WxRedirectController.java index 077ebe78..843e20a2 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WxRedirectController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WxRedirectController.java @@ -1,20 +1,16 @@ package co.yixiang.mp.controller; -import co.yixiang.mp.config.WxMpConfiguration; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.xml.ws.Action; - @AllArgsConstructor @Controller diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java index 9a549e7d..736e6021 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java @@ -1,8 +1,6 @@ package co.yixiang.mp.controller; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxArticle; import co.yixiang.mp.service.YxArticleService; import co.yixiang.mp.service.dto.YxArticleDTO; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java index 8fb5dde6..7c631c56 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java @@ -1,8 +1,6 @@ package co.yixiang.mp.controller; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxCache; import co.yixiang.mp.service.YxCacheService; import co.yixiang.utils.OrderUtil; diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java index b16b27cc..d81be203 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java @@ -1,8 +1,6 @@ package co.yixiang.mp.controller; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatReply; import co.yixiang.mp.service.YxWechatReplyService; import com.alibaba.fastjson.JSON; @@ -13,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java index 6009ddc9..39ca183b 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java @@ -1,10 +1,10 @@ package co.yixiang.mp.controller; -import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -12,7 +12,6 @@ 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.*; /** * @author xuwenbo diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java index 41a01e66..4a8d7886 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxWechatTemplateService.java @@ -3,12 +3,10 @@ package co.yixiang.mp.service; import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.dto.YxWechatTemplateDTO; import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; -import java.util.Map; + import java.util.List; +import java.util.Map; /** * @author xuwenbo diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java index 069714d1..0b2dcda0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java @@ -1,13 +1,13 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; 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.utils.OrderUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +15,6 @@ 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.*; /** * @author xuwenbo diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java index a0ebe6b6..4eb228cd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java @@ -1,15 +1,15 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -17,7 +17,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java index 4ef08aca..6085ab5a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java @@ -1,13 +1,13 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; 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.utils.OrderUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -15,7 +15,6 @@ 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.*; /** * @author xuwenbo diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java index d7c2ba0b..c97b7d7f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java @@ -1,7 +1,6 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; import co.yixiang.exception.BadRequestException; @@ -13,6 +12,8 @@ import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.dto.YxUserDTO; import co.yixiang.utils.OrderUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -20,7 +21,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 765dc7dc..8dcd1d48 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -1,27 +1,26 @@ package co.yixiang.modules.activity.service.impl; import co.yixiang.modules.activity.domain.YxStoreCombination; +import co.yixiang.modules.activity.repository.YxStoreCombinationRepository; import co.yixiang.modules.activity.repository.YxStorePinkRepository; import co.yixiang.modules.activity.repository.YxStoreVisitRepository; -import co.yixiang.utils.ValidationUtil; -import co.yixiang.modules.activity.repository.YxStoreCombinationRepository; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.dto.YxStoreCombinationDTO; import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCombinationMapper; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; -import java.util.Optional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index 23a393a5..a4e99fdc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -1,24 +1,25 @@ package co.yixiang.modules.activity.service.impl; import co.yixiang.modules.activity.domain.YxStoreCouponUser; -import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.activity.repository.YxStoreCouponUserRepository; import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDTO; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper; +import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.*; - -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index 8c69ccf4..a9650a70 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -1,29 +1,28 @@ package co.yixiang.modules.activity.service.impl; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.service.YxStoreCombinationService; -import co.yixiang.modules.activity.service.dto.YxStoreCombinationDTO; -import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.modules.shop.service.dto.YxUserDTO; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.activity.repository.YxStorePinkRepository; +import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.dto.YxStoreCombinationDTO; import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; +import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.modules.shop.service.dto.YxUserDTO; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; -import java.util.Optional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index 54ce47b7..3ec6edc2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -1,26 +1,25 @@ package co.yixiang.modules.activity.service.impl; import co.yixiang.modules.activity.domain.YxStoreSeckill; -import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.activity.repository.YxStoreSeckillRepository; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDTO; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreSeckillMapper; +import co.yixiang.utils.OrderUtil; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; -import java.util.Optional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author xuwenbo diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java index 95fd1b90..8b142254 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxExpress; import co.yixiang.modules.shop.service.YxExpressService; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -13,7 +13,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java index 070198bb..22735c15 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java @@ -1,14 +1,13 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.modules.shop.service.YxStoreCategoryService; import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import co.yixiang.utils.OrderUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ 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.util.List; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java index 796c9b51..02280a55 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java @@ -2,14 +2,15 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.exception.BadRequestException; -import co.yixiang.utils.OrderUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import co.yixiang.aop.log.Log; import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.dto.YxStoreProductQueryCriteria; +import co.yixiang.utils.OrderUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -17,7 +18,6 @@ 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.math.BigDecimal; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java index 407d6b8a..43861b10 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java @@ -10,14 +10,14 @@ 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; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java index b1aa1d64..adaca8f1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java @@ -1,12 +1,12 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.modules.shop.service.YxSystemUserLevelService; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria; import co.yixiang.utils.OrderUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +14,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java index f0511c42..4cacc0f3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java @@ -1,11 +1,11 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxSystemUserTask; import co.yixiang.modules.shop.service.YxSystemUserTaskService; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -15,7 +15,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java index 608973b3..b5aef183 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java @@ -1,17 +1,18 @@ package co.yixiang.modules.shop.rest; import co.yixiang.aop.log.Log; -import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java index c2c33063..3cf1e5c5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java @@ -1,15 +1,16 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.aop.log.Log; +import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.dto.UserMoneyDTO; -import co.yixiang.modules.shop.service.dto.YxUserDTO; +import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; import co.yixiang.modules.wechat.service.YxSystemConfigService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import co.yixiang.aop.log.Log; -import co.yixiang.modules.shop.domain.YxUser; -import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -17,7 +18,6 @@ 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.*; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index b76f8eec..12e6bb87 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; -import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.repository.YxStorePinkRepository; -import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.shop.domain.StoreOrderCartInfo; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.repository.YxStoreOrderCartInfoRepository; import co.yixiang.modules.shop.repository.YxStoreOrderRepository; import co.yixiang.modules.shop.repository.YxUserRepository; import co.yixiang.modules.shop.service.YxStoreOrderService; @@ -26,14 +26,14 @@ import co.yixiang.utils.QueryHelp; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.ValidationUtil; import com.alibaba.fastjson.JSON; -import co.yixiang.modules.shop.domain.StoreOrderCartInfo; -import co.yixiang.modules.shop.repository.YxStoreOrderCartInfoRepository; import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -41,9 +41,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - /** * @author hupeng * @date 2019-10-14 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index 3fb3bf92..a95fa26c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -1,27 +1,24 @@ package co.yixiang.modules.shop.service.impl; -import cn.hutool.core.util.StrUtil; import co.yixiang.modules.shop.domain.YxStoreProductReply; -import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.shop.repository.YxStoreProductReplyRepository; import co.yixiang.modules.shop.service.YxStoreProductReplyService; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDTO; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; - /** * @author hupeng * @date 2019-11-03 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 5d93e950..330bcffc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -1,22 +1,25 @@ package co.yixiang.modules.shop.service.impl; -import cn.hutool.core.util.*; -import co.yixiang.modules.shop.domain.YxStoreProduct; -import co.yixiang.modules.shop.repository.*; -import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.service.dto.*; -import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; +import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; import co.yixiang.modules.shop.repository.*; +import co.yixiang.modules.shop.service.YxStoreProductService; import co.yixiang.modules.shop.service.dto.*; +import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; import co.yixiang.utils.OrderUtil; +import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -25,10 +28,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.QueryHelp; - /** * @author hupeng * @date 2019-10-04 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index 7223e5ad..53588a98 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -1,25 +1,23 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemGroupData; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.shop.repository.YxSystemGroupDataRepository; import co.yixiang.modules.shop.service.YxSystemGroupDataService; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDTO; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemGroupDataMapper; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import com.alibaba.fastjson.JSON; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; - /** * @author hupeng * @date 2019-10-18 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java index 526b0926..8577e80e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java @@ -1,26 +1,25 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemUserTask; -import co.yixiang.modules.shop.service.YxSystemUserLevelService; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.shop.repository.YxSystemUserTaskRepository; +import co.yixiang.modules.shop.service.YxSystemUserLevelService; import co.yixiang.modules.shop.service.YxSystemUserTaskService; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDTO; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemUserTaskMapper; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; -import java.util.Optional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author hupeng diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index 65c465f8..8c627484 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -1,26 +1,24 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.service.dto.UserBillDTO; -import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.shop.repository.YxUserBillRepository; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.dto.YxUserBillDTO; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxUserBillMapper; +import co.yixiang.utils.QueryHelp; +import co.yixiang.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; -import java.util.Optional; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author hupeng