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

fix manager api calling updateGoodsMarketAble error

Browse Source 
fix manager api es generator get progress error info
This commit is contained in:
paulGao 2021-09-16 11:55:58 +08:00
parent 471b128f22
commit 8ae04e7ee6
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,25 +282,27 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
public Boolean updateGoodsMarketAble(List<String> goodsIds, GoodsStatusEnum goodsStatusEnum, String underReason) { public Boolean updateGoodsMarketAble(List<String> goodsIds, GoodsStatusEnum goodsStatusEnum, String underReason) {
boolean result; boolean result;
AuthUser currentUser = UserContext.getCurrentUser();
if (currentUser == null || (currentUser.getRole().equals(UserEnums.STORE) && currentUser.getStoreId() == null)) {
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
//如果商品为空，直接返回 //如果商品为空，直接返回
if (goodsIds == null || goodsIds.isEmpty()) { if (goodsIds == null || goodsIds.isEmpty()) {
return true; return true;
} }
LambdaUpdateWrapper<Goods> updateWrapper = Wrappers.lambdaUpdate(); LambdaUpdateWrapper<Goods> updateWrapper = Wrappers.lambdaUpdate();
LambdaQueryWrapper<Goods> queryWrapper = new LambdaQueryWrapper<Goods>().in(Goods::getId, goodsIds);
updateWrapper.set(Goods::getMarketEnable, goodsStatusEnum.name()); updateWrapper.set(Goods::getMarketEnable, goodsStatusEnum.name());
updateWrapper.set(Goods::getUnderMessage, underReason); updateWrapper.set(Goods::getUnderMessage, underReason);
updateWrapper.eq(Goods::getStoreId, currentUser.getStoreId()); 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) {
updateWrapper.eq(Goods::getStoreId, currentUser.getStoreId());
queryWrapper.eq(Goods::getStoreId, currentUser.getStoreId());
}
updateWrapper.in(Goods::getId, goodsIds); updateWrapper.in(Goods::getId, goodsIds);
result = this.update(updateWrapper); result = this.update(updateWrapper);
//修改规格商品 //修改规格商品
List<Goods> goodsList = this.list(new LambdaQueryWrapper<Goods>().in(Goods::getId, goodsIds).eq(Goods::getStoreId, currentUser.getStoreId())); List<Goods> goodsList = this.list(queryWrapper);
for (Goods goods : goodsList) { for (Goods goods : goodsList) {
goodsSkuService.updateGoodsSkuStatus(goods); goodsSkuService.updateGoodsSkuStatus(goods);
} }

1
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
View File

@ -199,7 +199,6 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
resultMap.put(KEY_FAIL, 0); resultMap.put(KEY_FAIL, 0);
resultMap.put(KEY_PROCESSED, 0); resultMap.put(KEY_PROCESSED, 0);
cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix() + "", resultMap); cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix() + "", resultMap);
cache.put(CachePrefix.INIT_INDEX_FLAG.getPrefix(), true);
if (!goodsIndexList.isEmpty()) { if (!goodsIndexList.isEmpty()) {
goodsIndexRepository.deleteAll(); goodsIndexRepository.deleteAll();
for (EsGoodsIndex goodsIndex : goodsIndexList) { for (EsGoodsIndex goodsIndex : goodsIndexList) {

18
manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
View File

@ -80,9 +80,15 @@ public class ElasticsearchController {
public ResultMessage<String> init() { public ResultMessage<String> init() {
Boolean flag = (Boolean) cache.get(CachePrefix.INIT_INDEX_FLAG.getPrefix()); Boolean flag = (Boolean) cache.get(CachePrefix.INIT_INDEX_FLAG.getPrefix());
if (flag == null) {
cache.put(CachePrefix.INIT_INDEX_FLAG.getPrefix(), false);
}
if (Boolean.TRUE.equals(flag)) { if (Boolean.TRUE.equals(flag)) {
return ResultUtil.error(100000, "当前有任务在执行"); return ResultUtil.error(100000, "当前有任务在执行");
} }
cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix(), null);
cache.put(CachePrefix.INIT_INDEX_FLAG.getPrefix(), true);
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
//查询商品信息 //查询商品信息
LambdaQueryWrapper<GoodsSku> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GoodsSku> queryWrapper = new LambdaQueryWrapper<>();
@ -129,9 +135,13 @@ public class ElasticsearchController {
@GetMapping("/progress") @GetMapping("/progress")
public ResultMessage<Map<String, Integer>> getProgress() { public ResultMessage<Map<String, Integer>> getProgress() {
Map<String, Integer> map = (Map<String, Integer>) cache.get(CachePrefix.INIT_INDEX_PROCESS.getPrefix()); try {
Boolean flag = (Boolean) cache.get(CachePrefix.INIT_INDEX_FLAG.getPrefix()); Map<String, Integer> map = (Map<String, Integer>) cache.get(CachePrefix.INIT_INDEX_PROCESS.getPrefix());
map.put("flag", Boolean.TRUE.equals(flag) ? 1 : 0); Boolean flag = (Boolean) cache.get(CachePrefix.INIT_INDEX_FLAG.getPrefix());
return ResultUtil.data(map); map.put("flag", Boolean.TRUE.equals(flag) ? 1 : 0);
return ResultUtil.data(map);
} catch (Exception e) {
return ResultUtil.data(null);
}
} }
} }