From d2b9ce5ceb7059dfa06e9281661c8c9516686dd0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 06 十月 2025 19:54:22 +0800 Subject: [PATCH] bug修改 --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java index 146520a..1020aa5 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java @@ -33,7 +33,6 @@ @Autowired private StoreService storeService; - @Autowired private GDMapGeocodingUtil gdMapGeocodingUtil; @@ -42,6 +41,14 @@ @Autowired private TBackRecordService backRecordService; + + @Autowired + private TStoreOtherConfigTrueService tStoreOtherConfigTrueService; + + + + + /** * 获取根据门店id 获取店长信息 @@ -408,12 +415,13 @@ } } - @Autowired - private TStoreOtherConfigTrueService tStoreOtherConfigTrueService; + + + @ResponseBody @PostMapping("/base/store/queryIndexSet") - @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"}) + @ApiOperation(value = "获取门店首页设置", tags = {"APP-免费福利"}) @ApiImplicitParams({ @ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true), }) @@ -421,9 +429,16 @@ try { List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>(); - List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id).eq(TStoreOther::getState, 1)); + List<TStoreOther> list = tStoreOtherService + .list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id) + .eq(TStoreOther::getState, 1)); if (list.size() > 0) { - tStoreOtherConfigTrues = tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState, 1)); + tStoreOtherConfigTrues = tStoreOtherConfigTrueService + .list(new LambdaQueryWrapper<TStoreOtherConfigTrue>() + .in(TStoreOtherConfigTrue::getPid, + list.stream().map(TStoreOther::getId) + .collect(Collectors.toList())) + .eq(TStoreOtherConfigTrue::getState, 1)); } for (TStoreOtherConfigTrue tStoreOtherConfigTrue : tStoreOtherConfigTrues) { for (TStoreOther tStoreOther : list) { @@ -431,6 +446,7 @@ tStoreOtherConfigTrue.setSort(tStoreOther.getSort()); } } + tStoreOtherConfigTrue.setDisplayType(2); } return ResultUtil.success(tStoreOtherConfigTrues); } catch (Exception e) { -- Gitblit v1.7.1