Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-09-01 c560f1a14ae1fc468d90e50e6a32d805295875da

 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,16 +415,17 @@
        }
    }

    @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),
    })
    public ResultUtil<List<TStoreOtherVo>> queryIndexSet(Integer id) {
    public ResultUtil<List<TStoreOtherConfigTrue>> queryIndexSet(Integer id) {
        try {
            List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>();

@@ -425,20 +433,15 @@
            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));
            }
            List<TStoreOtherVo> list1 = new ArrayList<>();
            for (TStoreOther tStoreOther : list) {
                TStoreOtherVo storeOtherVo = new TStoreOtherVo();
                BeanUtils.copyProperties(tStoreOther, storeOtherVo);
                List<TStoreOtherConfigTrue> lists = new ArrayList<>();
                for (TStoreOtherConfigTrue tStoreOtherConfigTrue : tStoreOtherConfigTrues) {
            for (TStoreOtherConfigTrue tStoreOtherConfigTrue : tStoreOtherConfigTrues) {
                for (TStoreOther tStoreOther : list) {
                    if (tStoreOtherConfigTrue.getPid() == tStoreOther.getId()) {
                        lists.add(tStoreOtherConfigTrue);
                        tStoreOtherConfigTrue.setSort(tStoreOther.getSort());
                    }
                }
                storeOtherVo.setList(lists);
                list1.add(storeOtherVo);
                tStoreOtherConfigTrue.setDisplayType(2);
            }
            return ResultUtil.success(list1);
            return ResultUtil.success(tStoreOtherConfigTrues);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();