From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 17 十月 2023 17:25:16 +0800 Subject: [PATCH] 10.17.1 --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 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 f1c96eb..1ed5022 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 @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.other.entity.Store; +import com.dsh.other.entity.TBackRecord; +import com.dsh.other.entity.TStoreOther; +import com.dsh.other.entity.TStoreOtherConfigTrue; import com.dsh.other.feignclient.model.*; import com.dsh.other.model.*; -import com.dsh.other.service.StoreService; +import com.dsh.other.service.*; import com.dsh.other.util.GDMapGeocodingUtil; import com.dsh.other.util.ResultUtil; import com.dsh.other.util.ToolUtil; @@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.*; +import java.util.stream.Collectors; @RestController @RequestMapping("") @@ -29,6 +33,11 @@ @Autowired private GDMapGeocodingUtil gdMapGeocodingUtil; + @Autowired + private TStoreOtherService tStoreOtherService; + + @Autowired + private TBackRecordService backRecordService; /** * 根据城市管理员id获取门店 @@ -246,7 +255,7 @@ */ @ResponseBody @PostMapping("/store/queryStoreListByName") - public List<Store> queryStoreListByName(@RequestParam("name") String name){ + public List<Store> queryStoreListByName(@RequestBody String name){ try { List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name)); return stores; @@ -274,6 +283,17 @@ } + @PostMapping("/store/addBackRecord") + public void addBackRecord(@RequestBody String s){ + TBackRecord tBackRecord = new TBackRecord(); + String[] split = s.split("_"); + tBackRecord.setMoney(Double.valueOf(split[0])); + tBackRecord.setUserId(Integer.valueOf(split[1])); + tBackRecord.setTime(new Date()); + backRecordService.save(tBackRecord); + } + + @ResponseBody @@ -295,6 +315,30 @@ } } + @Autowired + private TStoreOtherConfigTrueService tStoreOtherConfigTrueService; + @ResponseBody + @PostMapping("/base/store/queryIndexSet") + @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true), + }) + 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)); + 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)); + } + return ResultUtil.success(tStoreOtherConfigTrues); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + -- Gitblit v1.7.1