code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur

Browse Source
This commit is contained in:
Chopper
2021-06-18 14:23:54 +08:00
parent 7113914ccd 78b5b5a324
commit 30d34d69f1
46 changed files with 482 additions and 1646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java
View File

@@ -97,13 +97,8 @@ public class BrandManagerController {
@ApiImplicitParam(name = "ids", value = "品牌ID", required = true, dataType = "String", allowMultiple = true, paramType = "path")
@DeleteMapping(value = "/delByIds/{ids}")
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
for (String id : ids) {
Brand brand = brandService.getById(id);
brand.setDeleteFlag(true);
brandService.updateById(brand);
}
return ResultUtil.success(ResultCode.BRAND_DELETE_ERROR);
brandService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
}
}

2
manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
View File

@@ -42,7 +42,7 @@ public class MemberEvaluationManagerController {
@GetMapping(value = "/getByPage")
public ResultMessage<IPage<MemberEvaluationListVO>> getByPage(EvaluationQueryParams evaluationQueryParams, PageVO page) {
return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams, page));
return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams));
}
@ApiOperation(value = "修改评价状态")

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

@@ -1,9 +1,15 @@
package cn.lili.controller.other;
import cn.hutool.json.JSONUtil;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dos.GoodsParams;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.entity.dos.Parameters;
import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.goods.service.ParametersService;
import cn.lili.modules.promotion.service.PromotionService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.modules.search.service.EsGoodsIndexService;
@@ -38,12 +44,18 @@ public class ElasticsearchController {
@Autowired
private GoodsSkuService goodsSkuService;
@Autowired
private GoodsService goodsService;
@Autowired
private StringRedisTemplate stringRedisTemplate;
@Autowired
private PromotionService promotionService;
@Autowired
private ParametersService parametersService;
@GetMapping
public void init() {
//查询商品信息
@@ -53,16 +65,33 @@ public class ElasticsearchController {
List<GoodsSku> list = goodsSkuService.list(queryWrapper);
List<EsGoodsIndex> esGoodsIndices = new ArrayList<>();
String goodsId = null;
//库存锁是在redis做的，所以生成索引，同时更新一下redis中的库存数量
for (GoodsSku goodsSku : list) {
EsGoodsIndex index = new EsGoodsIndex(goodsSku);
Map<String, Object> goodsCurrentPromotionMap = promotionService.getGoodsCurrentPromotionMap(index);
index.setPromotionMap(goodsCurrentPromotionMap);
esGoodsIndices.add(index);
stringRedisTemplate.opsForValue().set(GoodsSkuService.getStockCacheKey(goodsSku.getId()), goodsSku.getQuantity().toString());
boolean needIndex = false;
if (goodsId == null || !goodsId.equals(goodsSku.getGoodsId())) {
goodsId = goodsSku.getGoodsId();
Goods goods = goodsService.getById(goodsId);
if (goods.getParams() != null && !goods.getParams().isEmpty()) {
List<GoodsParams> goodsParams = JSONUtil.toList(goods.getParams(), GoodsParams.class);
for (GoodsParams goodsParam : goodsParams) {
Parameters parameters = parametersService.getById(goodsParam.getParamId());
if (parameters.getIsIndex() == 1) {
needIndex = true;
break;
}
}
}
}
if (Boolean.TRUE.equals(needIndex)) {
EsGoodsIndex index = new EsGoodsIndex(goodsSku);
Map<String, Object> goodsCurrentPromotionMap = promotionService.getGoodsCurrentPromotionMap(index);
index.setPromotionMap(goodsCurrentPromotionMap);
esGoodsIndices.add(index);
stringRedisTemplate.opsForValue().set(GoodsSkuService.getStockCacheKey(goodsSku.getId()), goodsSku.getQuantity().toString());
}
}
//初始化商品索引
esGoodsIndexService.initIndex(esGoodsIndices);
Assertions.assertTrue(true);
}
}

2
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@@ -2,6 +2,7 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.base.aspect.DemoSite;
import cn.lili.modules.base.service.RegionService;
import cn.lili.modules.system.entity.dos.Region;
import io.swagger.annotations.Api;
@@ -29,6 +30,7 @@ public class RegionManagerController {
@Autowired
private RegionService regionService;
@DemoSite
@PostMapping(value = "/sync")
@ApiOperation(value = "同步高德行政地区数据")
public void synchronizationData(String url) {