From cabda12d788eeb6e056113ac8352dfaf972490d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 17:10:44 +0800
Subject: [PATCH] bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 38e3a64..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,37 +415,40 @@
}
}
- @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<>();
- 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));
}
- 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();
--
Gitblit v1.7.1