分销模块拆离

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;

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;

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;

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;

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<GoodsMapper, Goods> 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);
+        if (currentUser != null && (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null)) {
-        } else if (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() != null) {
             return currentUser;
+        } else {
+            throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }
-        return null;
     }
 
     /**

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java

@@ -491,6 +491,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
      *
      * @param goods 商品信息
      */
+    @Override
     public void generateEs(Goods goods) {
         String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.GENERATOR_GOODS_INDEX.name();
         //发送mq消息

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;

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;

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;

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;

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;

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;