From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java |   90 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 87 insertions(+), 3 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 5290264..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,51 @@
     @Autowired
     private GDMapGeocodingUtil gdMapGeocodingUtil;
 
+    @Autowired
+    private TStoreOtherService tStoreOtherService;
+
+    @Autowired
+    private TBackRecordService backRecordService;
+
+    /**
+     * 根据城市管理员id获取门店
+     */
+    @RequestMapping("base/site/getStoreByCityManagerId")
+    public Object getStoreByCityManagerId(@RequestBody Integer id){
+        return storeService.getStoreByCityManagerId(id);
+    }
+    /**
+     * 根据员工id获取门店
+     */
+    @RequestMapping("base/site/getStoreByStoreStaffId")
+    public Object getStoreByStoreStaffId(@RequestBody Integer id){
+        return storeService.getStoreByStoreStaffId(id);
+    }
+
+    /**
+     * 根据门店id获取门店信息
+     */
+    @RequestMapping("base/site/getStoreById")
+    public Store getStoreById(@RequestBody Integer id){
+        return storeService.getOne(new QueryWrapper<Store>().eq("id",id));
+    }
+    /**
+     * 选择市区 展示全部门店
+     */
+    @RequestMapping("base/store/getStore")
+    public List<Store> getStore(@RequestBody String city){
+        return storeService.list(new QueryWrapper<Store>().eq("city",city));
+    }
+
+    /**
+     * 根据所选门店 查询经营时间
+     * @param oneId
+     * @return
+     */
+    @RequestMapping("base/store/getTime")
+    public Store getTime(@RequestBody String oneId){
+        return storeService.getOne(new QueryWrapper<Store>().eq("name",oneId));
+    }
 
 
 
@@ -168,7 +217,7 @@
      */
     @ResponseBody
     @PostMapping("/store/queryStoreByIds")
-    public List<Store> queryStoreByIds(List<Integer> ids){
+    public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
         try {
             return storeService.list(new LambdaQueryWrapper<Store>()
                     .in(Store::getId,ids));
@@ -206,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;
@@ -234,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
@@ -255,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