From d8da258898b8aece13190c2a9951486368ff7920 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 7 Dec 2021 09:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E6=A8=A1=E5=9D=97=E6=8B=86?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/DistributionBuyerController.java | 2 +- .../DistributionCashBuyerController.java | 2 +- .../DistributionGoodsBuyerController.java | 2 +- .../DistributionOrderBuyerController.java | 2 +- .../modules/goods/serviceimpl/GoodsServiceImpl.java | 12 ++++-------- .../goods/serviceimpl/GoodsSkuServiceImpl.java | 1 + .../DistributionCashManagerController.java | 2 +- .../DistributionGoodsManagerController.java | 3 +-- .../distribution/DistributionManagerController.java | 2 +- .../DistributionOrderManagerController.java | 2 +- .../DistributionGoodsStoreController.java | 2 +- .../DistributionOrderStoreController.java | 2 +- 12 files changed, 15 insertions(+), 19 deletions(-) rename buyer-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionBuyerController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionCashBuyerController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionGoodsBuyerController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionOrderBuyerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionCashManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionGoodsManagerController.java (94%) rename manager-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionOrderManagerController.java (97%) rename seller-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionGoodsStoreController.java (98%) rename seller-api/src/main/java/cn/lili/controller/{other => }/distribution/DistributionOrderStoreController.java (97%) diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java index 68a874885..dc3567dc7 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java index d27ee7429..4b6d310ee 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java index b2e68fa1a..e4497dc9b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java index 4ed20e944..4c7c3ddd5 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 265694adb..453dc36a0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -1,7 +1,5 @@ package cn.lili.modules.goods.serviceimpl; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.json.JSONUtil; @@ -16,7 +14,6 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.modules.goods.entity.dos.Category; import cn.lili.modules.goods.entity.dos.Goods; import cn.lili.modules.goods.entity.dos.GoodsGallery; -import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; import cn.lili.modules.goods.entity.dto.GoodsSearchParams; @@ -27,7 +24,6 @@ import cn.lili.modules.goods.entity.vos.GoodsVO; import cn.lili.modules.goods.mapper.GoodsMapper; import cn.lili.modules.goods.service.*; import cn.lili.modules.member.entity.dos.MemberEvaluation; -import cn.lili.modules.member.entity.dto.CollectionDTO; import cn.lili.modules.member.entity.enums.EvaluationGradeEnum; import cn.lili.modules.member.service.MemberEvaluationService; import cn.lili.modules.store.entity.dos.FreightTemplate; @@ -477,12 +473,12 @@ public class GoodsServiceImpl extends ServiceImpl implements */ private AuthUser checkStoreAuthority() { AuthUser currentUser = UserContext.getCurrentUser(); - if (currentUser == null || (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() == null)) { - throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); - } else if (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null) { + //如果当前会员不为空，且为店铺角色 + if (currentUser != null && (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null)) { return currentUser; + } else { + throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); } - return null; } /** diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index b6c8fc5a8..663c686f1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -491,6 +491,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i * * @param goods 商品信息 */ + @Override public void generateEs(Goods goods) { String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.GENERATOR_GOODS_INDEX.name(); //发送mq消息 diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java rename to manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java index 67838270b..ef0fde1ca 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java similarity index 94% rename from manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java rename to manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java index 599688521..a4182635b 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java @@ -1,6 +1,5 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; -import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams; diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java similarity index 98% rename from manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java rename to manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java index bbb98c1b2..a6764dff4 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java rename to manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java index ae1c3d8f0..acbbdb249 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java similarity index 98% rename from seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java rename to seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java index 2dfb6d5d6..20d14c275 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java similarity index 97% rename from seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java rename to seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java index ab18fba4d..21ac76b82 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.other.distribution; +package cn.lili.controller.distribution; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext;