caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分销模块拆离

Browse Source
This commit is contained in:
Chopper 2021-12-07 09:00:59 +08:00
parent 8616854e00
commit d8da258898
12 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java → buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java → buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java → buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java → buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java
View File

@ -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;

12
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -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);
} 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;
}
/**

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

@ -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消息

2
manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java → manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java
View File

@ -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;

3
manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java → manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java → manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java → manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java
View File

@ -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;

2
seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java → seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
View File

@ -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;

2
seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java → seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
View File

@ -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;